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

Unified Diff: media/filters/jpeg_parser.h

Issue 1291933002: File video capture device supports MJPEG format (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 side-by-side diff with in-line comments
Download patch
Index: media/filters/jpeg_parser.h
diff --git a/media/filters/jpeg_parser.h b/media/filters/jpeg_parser.h
index fa13dd764303a6caa781065dc4d49e837ac520c8..aaeea33c25690513c1388cadc23baa947cdb6506 100644
--- a/media/filters/jpeg_parser.h
+++ b/media/filters/jpeg_parser.h
@@ -30,6 +30,15 @@ enum JpegMarker {
JPEG_SOS = 0xDA, // start of scan
JPEG_DQT = 0xDB, // define quantization table
JPEG_DRI = 0xDD, // define restart internal
+ JPEG_RST0 = 0xD0, // Restart
kcwu 2015/08/14 09:01:38 s/R/r/
henryhsu 2015/08/14 11:22:27 Done.
+ JPEG_RST1 = 0xD1, // Restart
+ JPEG_RST2 = 0xD2, // Restart
+ JPEG_RST3 = 0xD3, // Restart
+ JPEG_RST4 = 0xD4, // Restart
+ JPEG_RST5 = 0xD5, // Restart
+ JPEG_RST6 = 0xD6, // Restart
+ JPEG_RST7 = 0xD7, // Restart
+ JPEG_EOI = 0xD9, // end of image
JPEG_MARKER_PREFIX = 0xFF, // jpeg marker prefix
};
@@ -87,6 +96,7 @@ struct JpegParseResult {
JpegScanHeader scan;
const char* data;
size_t data_size;
+ size_t image_size;
kcwu 2015/08/14 09:01:37 add comment to explain data_size and image_size. T
kcwu 2015/08/14 09:01:38 Please exam this new value in the unit test.
henryhsu 2015/08/14 11:22:27 Done.
henryhsu 2015/08/14 11:22:27 Done.
};
// Parses JPEG picture in |buffer| with |length|. Returns true iff header is

Powered by Google App Engine
This is Rietveld 408576698