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

Side by Side Diff: media/filters/ivf_parser.cc

Issue 1269473002: Extract IVF parser from VP8 parser unittest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
(Empty)
1 #include "base/logging.h"
2 #include "base/sys_byteorder.h"
3 #include "media/filters/ivf_parser.h"
4
5 namespace {
xhwang 2015/07/29 16:43:42 nit: Move this whole block into namespace media.
kcwu 2015/07/30 11:52:52 Done.
6
7 const size_t kIvfFileHeaderSize = 32;
wuchengli 2015/07/30 06:26:13 Can we use sizeof(IvfFileHeader)? Same for kIvfFra
kcwu 2015/07/30 11:52:52 Done.
8 const size_t kIvfFrameHeaderSize = 12;
9
10 uint16_t ReadU16(const uint8_t* buffer) {
11 return base::ByteSwapToLE16(*reinterpret_cast<const uint16_t*>(buffer));
12 }
13
14 uint32_t ReadU32(const uint8_t* buffer) {
15 return base::ByteSwapToLE32(*reinterpret_cast<const uint32_t*>(buffer));
16 }
17
18 uint64_t ReadU64(const uint8_t* buffer) {
19 return base::ByteSwapToLE64(*reinterpret_cast<const uint64_t*>(buffer));
20 }
21
22 } // namespace
23
24 namespace media {
25
26 IvfParser::IvfParser() : ptr_(nullptr), end_(nullptr) {}
27
28 bool IvfParser::Initialize(const uint8_t* stream,
29 size_t size,
30 IvfFileHeader* file_header) {
31 DCHECK(stream);
32 DCHECK(file_header);
33 if (size < kIvfFileHeaderSize) {
34 DLOG(ERROR) << "EOF before file header";
35 return false;
36 }
37
38 ptr_ = stream;
39 end_ = stream + size;
40
41 // signature
42 if (ptr_[0] != 'D' || ptr_[1] != 'K' || ptr_[2] != 'I' || ptr_[3] != 'F') {
43 DLOG(ERROR) << "IVF signature mismatch";
44 return false;
45 }
46
47 file_header->version = ReadU16(ptr_ + 4);
48 file_header->header_size = ReadU16(ptr_ + 6);
49 if (file_header->header_size != kIvfFileHeaderSize) {
50 DLOG(ERROR) << "IVF file header size mismatch";
51 return false;
52 }
53 file_header->fourcc = ReadU32(ptr_ + 8);
54 file_header->width = ReadU16(ptr_ + 12);
55 file_header->height = ReadU16(ptr_ + 14);
56 file_header->timebase_denum = ReadU32(ptr_ + 16);
57 file_header->timebase_num = ReadU32(ptr_ + 20);
58 file_header->num_frames = ReadU32(ptr_ + 24);
59 file_header->unused = ReadU32(ptr_ + 28);
xhwang 2015/07/29 16:43:42 Does media::BitReader work for you? https://code.
kcwu 2015/07/30 11:52:52 Ah, great! I was finding it in base/ . I will use
60
61 ptr_ += kIvfFileHeaderSize;
62
63 return true;
64 }
65
66 bool IvfParser::ParseNextFrame(IvfFrameHeader* frame_header) {
67 DCHECK(ptr_);
68 if (ptr_ + kIvfFrameHeaderSize > end_) {
69 DLOG_IF(ERROR, ptr_ != end_) << "Incomplete frame header";
70 return false;
71 }
72 frame_header->data_size = ReadU32(ptr_);
73 frame_header->timestamp = ReadU64(ptr_);
xhwang 2015/07/29 16:43:42 ptr_ + 4 ?
kcwu 2015/07/30 11:52:52 Revised.
74 ptr_ += kIvfFrameHeaderSize;
75
76 if (ptr_ + frame_header->data_size > end_) {
77 DLOG(ERROR) << "Not enough frame data";
78 return false;
79 }
80
81 frame_header->data = ptr_;
82 ptr_ += frame_header->data_size;
83 return true;
84 }
85
86 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698