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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/formats/mp2t/es_parser_h264.h

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« media/formats/mp2t/es_parser_adts.cc ('K') | « media/formats/mp2t/es_parser_adts.cc ('k') | media/formats/mp2t/es_parser_h264.cc » ('j') | media/formats/mp2t/es_parser_h264.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp2t/es_parser_h264.h
diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h
index b37cfc117c2833e673cfca16b2a40c1a27fcdba6..b9d391daf9b16067cf9aa0401fbbf95617a4e895 100644
--- a/media/formats/mp2t/es_parser_h264.h
+++ b/media/formats/mp2t/es_parser_h264.h
@@ -5,7 +5,6 @@
#ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
#define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
-#include <list>
#include <utility>
#include "base/basictypes.h"
@@ -66,7 +65,8 @@ class MEDIA_EXPORT EsParserH264 : public EsParser {
// Update the video decoder config based on an H264 SPS.
// Return true if successful.
- bool UpdateVideoDecoderConfig(const H264SPS* sps);
+ bool UpdateVideoDecoderConfig(const H264SPS* sps,
+ const EncryptionScheme& scheme);
ddorwin 2015/12/10 18:36:02 Fwd declare?
dougsteed 2015/12/14 21:19:02 Done.
EsAdapterVideo es_adapter_;
« media/formats/mp2t/es_parser_adts.cc ('K') | « media/formats/mp2t/es_parser_adts.cc ('k') | media/formats/mp2t/es_parser_h264.cc » ('j') | media/formats/mp2t/es_parser_h264.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698