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

Side by Side Diff: webrtc/modules/video_coding/include/video_codec_interface.h

Issue 2558453002: Revert of H.264 packetization mode 0 (try 3) (Closed)
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 // Frame reference data. 71 // Frame reference data.
72 uint8_t num_ref_pics; 72 uint8_t num_ref_pics;
73 uint8_t p_diff[kMaxVp9RefPics]; 73 uint8_t p_diff[kMaxVp9RefPics];
74 }; 74 };
75 75
76 struct CodecSpecificInfoGeneric { 76 struct CodecSpecificInfoGeneric {
77 uint8_t simulcast_idx; 77 uint8_t simulcast_idx;
78 }; 78 };
79 79
80 struct CodecSpecificInfoH264 { 80 struct CodecSpecificInfoH264 {};
81 H264PacketizationMode packetization_mode;
82 };
83 81
84 union CodecSpecificInfoUnion { 82 union CodecSpecificInfoUnion {
85 CodecSpecificInfoGeneric generic; 83 CodecSpecificInfoGeneric generic;
86 CodecSpecificInfoVP8 VP8; 84 CodecSpecificInfoVP8 VP8;
87 CodecSpecificInfoVP9 VP9; 85 CodecSpecificInfoVP9 VP9;
88 CodecSpecificInfoH264 H264; 86 CodecSpecificInfoH264 H264;
89 }; 87 };
90 88
91 // Note: if any pointers are added to this struct or its sub-structs, it 89 // Note: if any pointers are added to this struct or its sub-structs, it
92 // must be fitted with a copy-constructor. This is because it is copied 90 // must be fitted with a copy-constructor. This is because it is copied
93 // in the copy-constructor of VCMEncodedFrame. 91 // in the copy-constructor of VCMEncodedFrame.
94 struct CodecSpecificInfo { 92 struct CodecSpecificInfo {
95 CodecSpecificInfo() : codecType(kVideoCodecUnknown), codec_name(nullptr) {} 93 CodecSpecificInfo() : codecType(kVideoCodecUnknown), codec_name(nullptr) {}
96 VideoCodecType codecType; 94 VideoCodecType codecType;
97 const char* codec_name; 95 const char* codec_name;
98 CodecSpecificInfoUnion codecSpecific; 96 CodecSpecificInfoUnion codecSpecific;
99 }; 97 };
100 98
101 } // namespace webrtc 99 } // namespace webrtc
102 100
103 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_ 101 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/h264/h264_encoder_impl_unittest.cc ('k') | webrtc/test/fake_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698