Merge 55596 - Fix av sync for webm files with altref video frames. Altref fra...

media/filters/ffmpeg_video_decode_engine.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_video_decode_engine.h"
 
 #include "base/command_line.h"
 #include "base/task.h"
 #include "media/base/buffers.h"
 #include "media/base/callback.h"
@@ skipping 114 matching lines @@
   // Create a packet for input data.
   // Due to FFmpeg API changes we no longer have const read-only pointers.
   AVPacket packet;
   av_init_packet(&packet);
   packet.data = const_cast<uint8*>(buffer->GetData());
   packet.size = buffer->GetDataSize();
 
   // Let FFmpeg handle presentation timestamp reordering.
   codec_context_->reordered_opaque = buffer->GetTimestamp().InMicroseconds();
 
+  // This is for codecs not using get_buffer to initialize
+  // |av_frame_->reordered_opaque|
+  av_frame_->reordered_opaque = codec_context_->reordered_opaque;
+
   int frame_decoded = 0;
   int result = avcodec_decode_video2(codec_context_,
                                      av_frame_.get(),
                                      &frame_decoded,
                                      &packet);
 
   // Log the problem if we can't decode a video frame and exit early.
   if (result < 0) {
     LOG(INFO) << "Error decoding a video frame with timestamp: "
               << buffer->GetTimestamp().InMicroseconds() << " us"
@@ skipping 97 matching lines @@
     case PIX_FMT_YUVJ422P:
       return VideoFrame::YV16;
       break;
     default:
       // TODO(scherkus): More formats here?
       return VideoFrame::INVALID;
   }
 }
 
 }  // namespace media