Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: media/filters/ffmpeg_aac_bitstream_converter.h

Issue 2534193003: To M56: Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits). (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/audio_file_reader.cc ('k') | media/filters/ffmpeg_aac_bitstream_converter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_aac_bitstream_converter.h
diff --git a/media/filters/ffmpeg_aac_bitstream_converter.h b/media/filters/ffmpeg_aac_bitstream_converter.h
index fcf420608fa7963e49098190edabdbe57b65c0bb..ff8a03f784603b928153edb9efd2a2d933c65484 100644
--- a/media/filters/ffmpeg_aac_bitstream_converter.h
+++ b/media/filters/ffmpeg_aac_bitstream_converter.h
@@ -13,7 +13,7 @@
#include "media/filters/ffmpeg_bitstream_converter.h"
// Forward declarations for FFmpeg datatypes used.
-struct AVCodecContext;
+struct AVCodecParameters;
struct AVPacket;
namespace media {
@@ -24,10 +24,11 @@ class MEDIA_EXPORT FFmpegAACBitstreamConverter
public:
enum { kAdtsHeaderSize = 7 };
- // The |stream_codec_context| will be used during conversion and should be the
- // AVCodecContext for the stream sourcing these packets. A reference to
- // |stream_codec_context| is retained, so it must outlive this class.
- explicit FFmpegAACBitstreamConverter(AVCodecContext* stream_codec_context);
+ // The |stream_codec_parameters| will be used during conversion and should be
+ // the AVCodecParameters for the stream sourcing these packets. A reference to
+ // |stream_codec_parameters| is retained, so it must outlive this class.
+ explicit FFmpegAACBitstreamConverter(
+ AVCodecParameters* stream_codec_parameters);
~FFmpegAACBitstreamConverter() override;
// FFmpegBitstreamConverter implementation.
@@ -38,7 +39,7 @@ class MEDIA_EXPORT FFmpegAACBitstreamConverter
private:
// Variable to hold a pointer to memory where we can access the global
// data from the FFmpeg file format's global headers.
- AVCodecContext* stream_codec_context_;
+ AVCodecParameters* stream_codec_parameters_;
bool header_generated_;
uint8_t hdr_[kAdtsHeaderSize];
« no previous file with comments | « media/filters/audio_file_reader.cc ('k') | media/filters/ffmpeg_aac_bitstream_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698