Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d18196a1 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android Git Automerger
Browse files

am c8c68c88: Merge "Use aligned width and height to compute size." into lmp-mr1-dev 

* commit 'c8c68c88':
  Use aligned width and height to compute size.
parents e0344754 c8c68c88

media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp

+6 −3
Original line number Diff line number Diff line
@@ -247,10 +247,13 @@ OSCL_EXPORT_REF Bool PVInitVideoDecoder(VideoDecControls *decCtrl, uint8 *volbuf 
                        video->vol[idx]->useReverseVLC = 0;

                        video->intra_acdcPredDisable = 1;

                        video->vol[idx]->scalability = 0;

                        video->size = (int32)width * height;



                        video->displayWidth = video->width = width;

                        video->displayHeight = video->height = height;

                        video->displayWidth = width;

                        video->displayHeight = height;

                        video->width = (width + 15) & -16;

                        video->height = (height + 15) & -16;

                        video->size = (int32)video->width * video->height;



#ifdef PV_ANNEX_IJKT_SUPPORT

                        video->modified_quant = 0;

                        video->advanced_INTRA = 0;