coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-02-11 04:39:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate function

Browse Source 
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/1311006

git-svn-id: http://libyuv.googlecode.com/svn/trunk@657 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-04-11 20:37:10 +00:00
parent 8c8cf8d707
commit 15c7b2fffc
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 656 Version: 657
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 656 #define LIBYUV_VERSION 657
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

24
source/mjpeg_decoder.cc
View File

@ -75,30 +75,6 @@ MJpegDecoder::~MJpegDecoder() {
DestroyOutputBuffers(); DestroyOutputBuffers();
} }
// Helper function to validate the jpeg looks ok.
// TODO(fbarchard): Optimize case where SOI is found but EOI is not.
bool ValidateJpeg(const uint8* sample, size_t sample_size) {
if (sample_size < 64) {
// ERROR: Invalid jpeg size: sample_size
return false;
}
if (sample[0] != 0xff || sample[1] != 0xd8) { // Start Of Image
// ERROR: Invalid jpeg initial start code
return false;
}
for (int i = static_cast<int>(sample_size) - 2; i > 1;) {
if (sample[i] != 0xd9) {
if (sample[i] == 0xff && sample[i + 1] == 0xd9) { // End Of Image
return true;
}
--i;
}
--i;
}
// ERROR: Invalid jpeg end code not found. Size sample_size
return false;
}
bool MJpegDecoder::LoadFrame(const uint8* src, size_t src_len) { bool MJpegDecoder::LoadFrame(const uint8* src, size_t src_len) {
if (!ValidateJpeg(src, src_len)) { if (!ValidateJpeg(src, src_len)) {
return false; return false;