Remove DemuxerStream::GetAVStream() once and for all.

media/ffmpeg/ffmpeg_common.h

 // Copyright (c) 2011 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.
 
 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
 
 // Used for FFmpeg error codes.
 #include <cerrno>
 
@@ skipping 56 matching lines @@
 MEDIA_EXPORT int64 ConvertToTimeBase(const AVRational& time_base,
                                      const base::TimeDelta& timestamp);
 
 void AVCodecContextToAudioDecoderConfig(
     const AVCodecContext* codec_context,
     AudioDecoderConfig* config);
 void AudioDecoderConfigToAVCodecContext(
     const AudioDecoderConfig& config,
     AVCodecContext* codec_context);
 
-VideoCodec CodecIDToVideoCodec(CodecID codec_id);
-CodecID VideoCodecToCodecID(VideoCodec video_codec);
+void AVCodecContextToVideoDecoderConfig(

[scherkus (not reviewing), 2011/10/25 22:42:15]

I wonder whether this should be AVStreamToVideoDecoderConfig()

frame_rate and aspect_ratio are retrieved from AVStream

[acolwell GONE FROM CHROMIUM, 2011/10/26 17:09:13]

If we are only likely to call this from contexts where we have an AVStream then
I'm fine with that.

[scherkus (not reviewing), 2011/10/26 19:08:00]

Done.

+    const AVCodecContext* codec_context,
+    const AVRational& frame_rate,
+    const AVRational& aspect_ratio,
+    VideoDecoderConfig* config);
+void VideoDecoderConfigToAVCodecContext(
+    const VideoDecoderConfig& config,
+    AVCodecContext* codec_context);
 
 // Converts FFmpeg's channel layout to chrome's ChannelLayout.  |channels| can
 // be used when FFmpeg's channel layout is not informative in order to make a
 // good guess about the plausible channel layout based on number of channels.
 ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout,
                                                  int channels);
 
 // Converts FFmpeg's pixel formats to its corresponding supported video format.
 VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format);
 
 // Converts video formats to its corresponding FFmpeg's pixel formats.
 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format);
 
-// Calculates duration of one frame in the |stream| based on its frame rate.
-base::TimeDelta GetFrameDuration(AVStream* stream);
+// Calculates the duration of one frame based on the frame rate specified by
+// |config|.
+base::TimeDelta GetFrameDuration(const VideoDecoderConfig& config);

[scherkus (not reviewing), 2011/10/25 22:42:15]

should this be a method on VideoDecoderConfig?

I'm not entirely sure since we make use of av_q2d() -- hence why this function
is here

[acolwell GONE FROM CHROMIUM, 2011/10/26 17:09:13]

Yes.
av_q2d() impl is simply a.num / (double) a.den so lets just drop the call an use
this code directly.

+
+// Returns the aspect ratio based on the information contained inside |stream|.
+AVRational GetAspectRatio(AVStream* stream);
 
 // Calculates the natural width and height of the video using the video's
-// encoded dimensions and sample_aspect_ratio.
-gfx::Size GetNaturalSize(AVStream* stream);
+// encoded dimensions and aspect ratio.
+gfx::Size GetNaturalSize(const VideoDecoderConfig& config);

[scherkus (not reviewing), 2011/10/25 22:42:15]

ditto here due to av_q2d()

[acolwell GONE FROM CHROMIUM, 2011/10/26 17:09:13]

ditto

 
 // Closes & destroys all AVStreams in the context and then closes &
 // destroys the AVFormatContext.
 void DestroyAVFormatContext(AVFormatContext* format_context);
 
 }  // namespace media
 
 #endif  // MEDIA_FFMPEG_FFMPEG_COMMON_H_