zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add unit tests covering MultiplexImageComponent"

Browse Source 
This reverts commit 4dc891f5e3a4bcad4db31e1af0ad45b6c471eef2.

Reason for revert: Reverting this CL to make it possible to revert https://webrtc-review.googlesource.com/c/src/+/43242

Original change's description:
> Add unit tests covering MultiplexImageComponent
> 
> This CL changes some types in MultiplexImage and MultiplexImageComponent. Also,
> adds unit test coverage in TestMultiplexAdapter for these structs.
> 
> Bug: webrtc:7671
> Change-Id: I832d0466dc67d3b6b7fa0d3fb76f02c0190e474f
> Reviewed-on: https://webrtc-review.googlesource.com/44081
> Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
> Reviewed-by: Qiang Chen <qiangchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#21770}

TBR=qiangchen@chromium.org,emircan@webrtc.org

Change-Id: I9cce6ed5f2990a2f443e04a9e5913cbd296242e4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:7671
Reviewed-on: https://webrtc-review.googlesource.com/44341
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21773}
This commit is contained in:
Ivo Creusen
2018-01-26 12:43:22 +00:00
committed by Commit Bot
parent 665d18ea29
commit 15eeef4189
3 changed files with 10 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/video_coding/codecs/multiplex/include/multiplex_encoded_image_packer.h
View File

@ -71,7 +71,7 @@ struct MultiplexImageComponent {
// Identifies which component this frame represent, i.e. YUV frame vs Alpha
// frame.
uint8_t component_index;
int component_index;
// Stores the actual frame data of the encoded image.
EncodedImage encoded_image;
@ -79,11 +79,11 @@ struct MultiplexImageComponent {
// Struct holding the whole frame bundle of components of an image.
struct MultiplexImage {
uint16_t image_index;
uint8_t component_count;
int image_index;
int component_count;
std::vector<MultiplexImageComponent> image_components;
MultiplexImage(uint16_t picture_index, uint8_t component_count);
MultiplexImage(int picture_index, int frame_count);
};
// A utility class providing conversion between two representations of a