media/mp4/avc.h - Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption.

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

Unified Diff: media/mp4/avc.h

Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Use reinterpret_cast for string creation Created 8 years, 5 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

Index: media/mp4/avc.h

diff --git a/media/mp4/avc.h b/media/mp4/avc.h

index 8e826b01dec39d80c2ffc803924292cebd963487..86eebe07afc0ac7bf0dee2cfe4ddc394ca276cd5 100644

--- a/media/mp4/avc.h

+++ b/media/mp4/avc.h

@@ -17,9 +17,9 @@ struct AVCDecoderConfigurationRecord;

class MEDIA_EXPORT AVC {

public:

- static bool ConvertToAnnexB(int length_size, std::vector<uint8>* buffer);

+ static bool ConvertFrameToAnnexB(int length_size, std::vector<uint8>* buffer);

- static bool InsertParameterSets(

+ static bool ConvertParameterSetsToAnnexB(

const AVCDecoderConfigurationRecord& avc_config,

std::vector<uint8>* buffer);

};

« media/crypto/aes_decryptor_unittest.cc ('K') | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/mp4/avc.cc » ('j') | media/mp4/track_run_iterator.cc » ('J')