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

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

Issue 2273793002: Don't fail on profile changes in GpuVideoDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make MSE stop lying. Created 4 years, 4 months 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/h264_parser.cc ('k') | media/formats/mp4/box_definitions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/mp2t/es_parser_h264.cc
diff --git a/media/formats/mp2t/es_parser_h264.cc b/media/formats/mp2t/es_parser_h264.cc
index 7f112f05d704e0ec497e4f72c96a9ff8f6dc8a6e..c074d544356fb581f3369d2c528f19ddbc14ccd8 100644
--- a/media/formats/mp2t/es_parser_h264.cc
+++ b/media/formats/mp2t/es_parser_h264.cc
@@ -22,37 +22,6 @@
namespace media {
namespace mp2t {
-namespace {
-
-VideoCodecProfile ProfileIDCToVideoCodecProfile(int profile_idc) {
- switch (profile_idc) {
- case H264SPS::kProfileIDCBaseline:
- return H264PROFILE_BASELINE;
- case H264SPS::kProfileIDCMain:
- return H264PROFILE_MAIN;
- case H264SPS::kProfileIDCHigh:
- return H264PROFILE_HIGH;
- case H264SPS::kProfileIDHigh10:
- return H264PROFILE_HIGH10PROFILE;
- case H264SPS::kProfileIDHigh422:
- return H264PROFILE_HIGH422PROFILE;
- case H264SPS::kProfileIDHigh444Predictive:
- return H264PROFILE_HIGH444PREDICTIVEPROFILE;
- case H264SPS::kProfileIDScalableBaseline:
- return H264PROFILE_SCALABLEBASELINE;
- case H264SPS::kProfileIDScalableHigh:
- return H264PROFILE_SCALABLEHIGH;
- case H264SPS::kProfileIDStereoHigh:
- return H264PROFILE_STEREOHIGH;
- case H264SPS::kProfileIDSMultiviewHigh:
- return H264PROFILE_MULTIVIEWHIGH;
- }
- NOTREACHED() << "unknown video profile: " << profile_idc;
- return VIDEO_CODEC_PROFILE_UNKNOWN;
-}
-
-} // namespace
-
// An AUD NALU is at least 4 bytes:
// 3 bytes for the start code + 1 byte for the NALU type.
const int kMinAUDSize = 4;
@@ -325,7 +294,7 @@ bool EsParserH264::UpdateVideoDecoderConfig(const H264SPS* sps,
return false;
VideoDecoderConfig video_decoder_config(
- kCodecH264, ProfileIDCToVideoCodecProfile(sps->profile_idc),
+ kCodecH264, H264Parser::ProfileIDCToVideoCodecProfile(sps->profile_idc),
PIXEL_FORMAT_YV12, COLOR_SPACE_HD_REC709, coded_size, visible_rect,
natural_size, EmptyExtraData(), scheme);
« no previous file with comments | « media/filters/h264_parser.cc ('k') | media/formats/mp4/box_definitions.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698