Changing JPEG API to to accept rawImage and encodedImage; moved video_image.h from modules/video_coding/codecs to common_video/interface, and some general re-write to JPEG, especially with regard to memory handling. Required VCM/ViE changes are also included.

Review URL: http://webrtc-codereview.appspot.com/55002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@139 4adac7df-926f-26a2-2b94-8c16560cd09d

modules/video_coding/codecs/i420/main/source/i420.gyp

@@ -16,10 +16,12 @@
       'include_dirs': [
         '../interface',
         '../../../interface',
+        '../../../../../../common_video/interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../interface',
+          '../../../../../../common_video/interface',
         ],
       },
       'sources': [

modules/video_coding/codecs/interface/video_image.h

@@ -1,75 +0,0 @@
-/*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef VIDEO_IMAGE_H
-#define VIDEO_IMAGE_H
-
-#include "typedefs.h"
-#include <stdlib.h>
-
-namespace webrtc
-{
-
-enum VideoFrameType
-{
-    kKeyFrame = 0,
-    kDeltaFrame = 1,
-    kGoldenFrame = 2,
-    kAltRefFrame = 3,
-    kSkipFrame = 4
-};
-
-class RawImage
-{
-public:
-    RawImage() :    _width(0), _height(0), _timeStamp(0), _buffer(NULL),
-                    _length(0), _size(0) {}
-
-    RawImage(WebRtc_UWord8* buffer, WebRtc_UWord32 length,
-        WebRtc_UWord32 size) :
-                    _width(0), _height(0), _timeStamp(0),
-                    _buffer(buffer), _length(length), _size(size) {}
-
-    WebRtc_UWord32    _width;
-    WebRtc_UWord32    _height;
-    WebRtc_UWord32    _timeStamp;
-    WebRtc_UWord8*    _buffer;
-    WebRtc_UWord32    _length;
-    WebRtc_UWord32    _size;
-};
-
-class EncodedImage
-{
-public:
-    EncodedImage() :
-                     _encodedWidth(0), _encodedHeight(0), _timeStamp(0),
-                     _frameType(kDeltaFrame), _buffer(NULL), _length(0), _size(0),
-                     _completeFrame(false) {}
-
-    EncodedImage(WebRtc_UWord8* buffer,
-                 WebRtc_UWord32 length,
-                 WebRtc_UWord32 size) :
-                     _encodedWidth(0), _encodedHeight(0), _timeStamp(0),
-                     _frameType(kDeltaFrame), _buffer(buffer), _length(length),
-                     _size(size), _completeFrame(false) {}
-
-    WebRtc_UWord32              _encodedWidth;
-    WebRtc_UWord32              _encodedHeight;
-    WebRtc_UWord32              _timeStamp;
-    VideoFrameType             _frameType;
-    WebRtc_UWord8*              _buffer;
-    WebRtc_UWord32              _length;
-    WebRtc_UWord32              _size;
-    bool                        _completeFrame;
-};
-
-} // namespace webrtc
-
-#endif // VIDEO_IMAGE_H

modules/video_coding/codecs/test_framework/test_framework.gyp

@@ -18,6 +18,7 @@
 
       'include_dirs': [
         '../interface',
+        '../../../../common_video/interface',
       ],
 
       'direct_dependent_settings': {

modules/video_coding/codecs/vp8/main/source/vp8.gyp

@@ -15,6 +15,7 @@
       ],
       'include_dirs': [
         '../interface',
+        '../../../../../../common_video/interface',
         '../../../interface',
         '../../../../../interface',
       ],
@@ -49,6 +50,7 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '../interface',
+          '../../../../../../common_video/interface',
           '../../../interface',
         ],
       },