media/base/video_decoder_config.cc - Issue 1769593002: Add 4 VP9 profiles to the media::VideoCodecProfile enum.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/base/video_decoder_config.cc

Issue 1769593002: Add 4 VP9 profiles to the media::VideoCodecProfile enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hevc-codec-7

Patch Set: Better TODOs Created 4 years, 9 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/base/video_decoder_config.h"	5 #include "media/base/video_decoder_config.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "media/base/video_frame.h"	10 #include "media/base/video_frame.h"

(...skipping 15 matching lines...) Expand all Loading...
26 case H264PROFILE_SCALABLEHIGH:	26 case H264PROFILE_SCALABLEHIGH:

27 case H264PROFILE_STEREOHIGH:	27 case H264PROFILE_STEREOHIGH:

28 case H264PROFILE_MULTIVIEWHIGH:	28 case H264PROFILE_MULTIVIEWHIGH:

29 return kCodecH264;	29 return kCodecH264;

30 case HEVCPROFILE_MAIN:	30 case HEVCPROFILE_MAIN:

31 case HEVCPROFILE_MAIN10:	31 case HEVCPROFILE_MAIN10:

32 case HEVCPROFILE_MAIN_STILL_PICTURE:	32 case HEVCPROFILE_MAIN_STILL_PICTURE:

33 return kCodecHEVC;	33 return kCodecHEVC;

34 case VP8PROFILE_ANY:	34 case VP8PROFILE_ANY:

35 return kCodecVP8;	35 return kCodecVP8;

36 case VP9PROFILE_ANY:	36 case VP9PROFILE_PROFILE0:

	37 case VP9PROFILE_PROFILE1:

	38 case VP9PROFILE_PROFILE2:

	39 case VP9PROFILE_PROFILE3:

37 return kCodecVP9;	40 return kCodecVP9;

38 }	41 }

39 NOTREACHED();	42 NOTREACHED();

40 return kUnknownVideoCodec;	43 return kUnknownVideoCodec;

41 }	44 }

42	45

43 VideoDecoderConfig::VideoDecoderConfig()	46 VideoDecoderConfig::VideoDecoderConfig()

44 : codec_(kUnknownVideoCodec),	47 : codec_(kUnknownVideoCodec),

45 profile_(VIDEO_CODEC_PROFILE_UNKNOWN),	48 profile_(VIDEO_CODEC_PROFILE_UNKNOWN),

46 format_(PIXEL_FORMAT_UNKNOWN),	49 format_(PIXEL_FORMAT_UNKNOWN),

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 << " visible rect: [" << visible_rect().x() << "," << visible_rect().y()	114 << " visible rect: [" << visible_rect().x() << "," << visible_rect().y()

112 << "," << visible_rect().width() << "," << visible_rect().height() << "]"	115 << "," << visible_rect().width() << "," << visible_rect().height() << "]"

113 << " natural size: [" << natural_size().width() << ","	116 << " natural size: [" << natural_size().width() << ","

114 << natural_size().height() << "]"	117 << natural_size().height() << "]"

115 << " has extra data? " << (extra_data().empty() ? "false" : "true")	118 << " has extra data? " << (extra_data().empty() ? "false" : "true")

116 << " encrypted? " << (is_encrypted() ? "true" : "false");	119 << " encrypted? " << (is_encrypted() ? "true" : "false");

117 return s.str();	120 return s.str();

118 }	121 }

119	122

120 } // namespace media	123 } // namespace media

OLD	NEW

« no previous file with comments | « media/base/video_codecs.cc ('k') | media/cdm/cdm_adapter.cc » ('j') | remoting/client/plugin/pepper_video_renderer_3d.cc » ('J')