generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mjpeg: Move code only used in the encoder(s) to the appropriate header

Browse Source
This commit is contained in:
Diego Biurrun 2015-03-27 12:53:56 +01:00
parent 6ed38b1f65
commit e6e3dcba0c
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/jpeglsenc.c
View File

@ -31,6 +31,7 @@
#include "internal.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
#include "mjpeg.h" #include "mjpeg.h"
#include "mjpegenc.h"
#include "jpegls.h" #include "jpegls.h"
/** /**

7
libavcodec/mjpeg.h
View File

@ -36,7 +36,6 @@
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "avcodec.h" #include "avcodec.h"
#include "put_bits.h"
/* JPEG marker codes */ /* JPEG marker codes */
typedef enum { typedef enum {
@ -120,12 +119,6 @@ typedef enum {
/* 0x02 -> 0xbf reserved */ /* 0x02 -> 0xbf reserved */
} JPEG_MARKER; } JPEG_MARKER;
static inline void put_marker(PutBitContext *p, int code)
{
put_bits(p, 8, 0xff);
put_bits(p, 8, code);
}
#define PREDICT(ret, topleft, top, left, predictor)\ #define PREDICT(ret, topleft, top, left, predictor)\
switch(predictor){\ switch(predictor){\
case 1: ret= left; break;\ case 1: ret= left; break;\

1
libavcodec/mjpegdec.c
View File

@ -41,6 +41,7 @@
#include "mjpeg.h" #include "mjpeg.h"
#include "mjpegdec.h" #include "mjpegdec.h"
#include "jpeglsdec.h" #include "jpeglsdec.h"
#include "put_bits.h"
static int build_vlc(VLC *vlc, const uint8_t *bits_table, static int build_vlc(VLC *vlc, const uint8_t *bits_table,

7
libavcodec/mjpegenc.h
View File

@ -36,6 +36,7 @@
#include <stdint.h> #include <stdint.h>
#include "mpegvideo.h" #include "mpegvideo.h"
#include "put_bits.h"
typedef struct MJpegContext { typedef struct MJpegContext {
uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing
@ -49,6 +50,12 @@ typedef struct MJpegContext {
uint16_t huff_code_ac_chrominance[256]; uint16_t huff_code_ac_chrominance[256];
} MJpegContext; } MJpegContext;
static inline void put_marker(PutBitContext *p, int code)
{
put_bits(p, 8, 0xff);
put_bits(p, 8, code);
}
int ff_mjpeg_encode_init(MpegEncContext *s); int ff_mjpeg_encode_init(MpegEncContext *s);
void ff_mjpeg_encode_close(MpegEncContext *s); void ff_mjpeg_encode_close(MpegEncContext *s);
void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[8][64]); void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[8][64]);

1
libavcodec/mjpegenc_common.c
View File

@ -28,6 +28,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "put_bits.h" #include "put_bits.h"
#include "mjpegenc.h"
#include "mjpegenc_common.h" #include "mjpegenc_common.h"
#include "mjpeg.h" #include "mjpeg.h"