Commit 26819b2e authored by Alexandre Lissy's avatar Alexandre Lissy
Browse files

Bug 1292464 - Followup fix Gonk for VideoData cleanup from bug 1292032 r=mattwoodrow 

MozReview-Commit-ID: 73Hqb7kmTLo
parent 9d6eb499

dom/media/MediaData.cpp

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ VideoData::CreateAndCopyData(const VideoInfo& aInfo, 
  }



#ifdef MOZ_WIDGET_GONK

  if (!videoImage->IsValid() && !aImage && IsYV12Format(Y, Cb, Cr)) {

  if (!videoImage->IsValid() && IsYV12Format(Y, Cb, Cr)) {

    // Failed to allocate gralloc. Try fallback.

    v->mImage = aContainer->CreatePlanarYCbCrImage();

    if (!v->mImage) {

dom/media/omx/MediaOmxReader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -419,8 +419,8 @@ bool MediaOmxReader::DecodeVideoFrame(bool &aKeyframeSkip, 
                                       -1,

                                       picture);

    } else {

      v = VideoData::CreateAndCopyData(mInfo.mVideo,

                                       mDecoder->GetImageContainer(),

      v = VideoData::CreateAndCopyIntoTextureClient(

                                       mInfo.mVideo,

                                       pos,

                                       frame.mTimeUs,

                                       1, // We don't know the duration.