Commit 4978850c authored by Diego Biurrun's avatar Diego Biurrun

build: Split JPEG-related tables off into a separate component

parent 87f87ccf
...@@ -1590,6 +1590,7 @@ CONFIG_EXTRA=" ...@@ -1590,6 +1590,7 @@ CONFIG_EXTRA="
iirfilter iirfilter
imdct15 imdct15
intrax8 intrax8
jpegtables
lgplv3 lgplv3
lpc lpc
me_cmp me_cmp
...@@ -1826,7 +1827,7 @@ flv_encoder_select="h263_encoder" ...@@ -1826,7 +1827,7 @@ flv_encoder_select="h263_encoder"
fourxm_decoder_select="blockdsp bswapdsp" fourxm_decoder_select="blockdsp bswapdsp"
fraps_decoder_select="bswapdsp huffman" fraps_decoder_select="bswapdsp huffman"
g2m_decoder_deps="zlib" g2m_decoder_deps="zlib"
g2m_decoder_select="blockdsp idctdsp" g2m_decoder_select="blockdsp idctdsp jpegtables"
h261_decoder_select="mpeg_er mpegvideo" h261_decoder_select="mpeg_er mpegvideo"
h261_encoder_select="aandcttables mpegvideoenc" h261_encoder_select="aandcttables mpegvideoenc"
h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp" h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp"
...@@ -1850,13 +1851,13 @@ jpegls_decoder_select="golomb mjpeg_decoder" ...@@ -1850,13 +1851,13 @@ jpegls_decoder_select="golomb mjpeg_decoder"
jpegls_encoder_select="golomb" jpegls_encoder_select="golomb"
jv_decoder_select="blockdsp" jv_decoder_select="blockdsp"
lagarith_decoder_select="huffyuvdsp" lagarith_decoder_select="huffyuvdsp"
ljpeg_encoder_select="aandcttables idctdsp" ljpeg_encoder_select="aandcttables idctdsp jpegtables"
loco_decoder_select="golomb" loco_decoder_select="golomb"
mdec_decoder_select="blockdsp idctdsp mpegvideo" mdec_decoder_select="blockdsp idctdsp mpegvideo"
metasound_decoder_select="lsp mdct sinewin" metasound_decoder_select="lsp mdct sinewin"
mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
mjpeg_decoder_select="blockdsp hpeldsp idctdsp" mjpeg_decoder_select="blockdsp hpeldsp idctdsp jpegtables"
mjpeg_encoder_select="aandcttables mpegvideoenc" mjpeg_encoder_select="aandcttables jpegtables mpegvideoenc"
mjpegb_decoder_select="mjpeg_decoder" mjpegb_decoder_select="mjpeg_decoder"
mlp_decoder_select="mlp_parser" mlp_decoder_select="mlp_parser"
motionpixels_decoder_select="bswapdsp" motionpixels_decoder_select="bswapdsp"
...@@ -2017,6 +2018,9 @@ mpegvideo_parser_select="mpegvideo" ...@@ -2017,6 +2018,9 @@ mpegvideo_parser_select="mpegvideo"
mpeg4video_parser_select="error_resilience h263dsp mpeg_er mpegvideo qpeldsp" mpeg4video_parser_select="error_resilience h263dsp mpeg_er mpegvideo qpeldsp"
vc1_parser_select="mpegvideo startcode vc1_decoder" vc1_parser_select="mpegvideo startcode vc1_decoder"
# bitstream_filters
mjpeg2jpeg_bsf_select="jpegtables"
# external libraries # external libraries
libdcadec_decoder_deps="libdcadec" libdcadec_decoder_deps="libdcadec"
libfaac_encoder_deps="libfaac" libfaac_encoder_deps="libfaac"
...@@ -2107,7 +2111,7 @@ ogg_demuxer_select="golomb" ...@@ -2107,7 +2111,7 @@ ogg_demuxer_select="golomb"
opus_muxer_select="ogg_muxer" opus_muxer_select="ogg_muxer"
psp_muxer_select="mov_muxer" psp_muxer_select="mov_muxer"
rtp_demuxer_select="sdp_demuxer" rtp_demuxer_select="sdp_demuxer"
rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer" rtpdec_select="asf_demuxer jpegtables mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol"
rtsp_demuxer_select="http_protocol rtpdec" rtsp_demuxer_select="http_protocol rtpdec"
rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain" rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
sap_demuxer_select="sdp_demuxer" sap_demuxer_select="sdp_demuxer"
......
...@@ -61,6 +61,7 @@ OBJS-$(CONFIG_IDCTDSP) += idctdsp.o simple_idct.o jrevdct.o ...@@ -61,6 +61,7 @@ OBJS-$(CONFIG_IDCTDSP) += idctdsp.o simple_idct.o jrevdct.o
OBJS-$(CONFIG_IIRFILTER) += iirfilter.o OBJS-$(CONFIG_IIRFILTER) += iirfilter.o
OBJS-$(CONFIG_IMDCT15) += imdct15.o OBJS-$(CONFIG_IMDCT15) += imdct15.o
OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o
OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o
OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o
OBJS-$(CONFIG_LPC) += lpc.o OBJS-$(CONFIG_LPC) += lpc.o
OBJS-$(CONFIG_LSP) += lsp.o OBJS-$(CONFIG_LSP) += lsp.o
...@@ -206,7 +207,7 @@ OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o ...@@ -206,7 +207,7 @@ OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o
OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
OBJS-$(CONFIG_FRWU_DECODER) += frwu.o OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
OBJS-$(CONFIG_G2M_DECODER) += g2meet.o mjpeg.o OBJS-$(CONFIG_G2M_DECODER) += g2meet.o
OBJS-$(CONFIG_G723_1_DECODER) += g723_1.o acelp_vectors.o \ OBJS-$(CONFIG_G723_1_DECODER) += g723_1.o acelp_vectors.o \
celp_filters.o celp_filters.o
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o
...@@ -252,7 +253,7 @@ OBJS-$(CONFIG_JV_DECODER) += jvdec.o ...@@ -252,7 +253,7 @@ OBJS-$(CONFIG_JV_DECODER) += jvdec.o
OBJS-$(CONFIG_KGV1_DECODER) += kgv1dec.o OBJS-$(CONFIG_KGV1_DECODER) += kgv1dec.o
OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o
OBJS-$(CONFIG_LAGARITH_DECODER) += lagarith.o lagarithrac.o OBJS-$(CONFIG_LAGARITH_DECODER) += lagarith.o lagarithrac.o
OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpeg.o mjpegenc_common.o OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc_common.o
OBJS-$(CONFIG_LOCO_DECODER) += loco.o OBJS-$(CONFIG_LOCO_DECODER) += loco.o
OBJS-$(CONFIG_MACE3_DECODER) += mace.o OBJS-$(CONFIG_MACE3_DECODER) += mace.o
OBJS-$(CONFIG_MACE6_DECODER) += mace.o OBJS-$(CONFIG_MACE6_DECODER) += mace.o
...@@ -260,8 +261,8 @@ OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o ...@@ -260,8 +261,8 @@ OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o
OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \
twinvq.o twinvq.o
OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o
OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o
OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o mjpegenc_common.o OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpegenc_common.o
OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o
OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
...@@ -602,7 +603,6 @@ OBJS-$(CONFIG_OGG_DEMUXER) += mpeg12data.o \ ...@@ -602,7 +603,6 @@ OBJS-$(CONFIG_OGG_DEMUXER) += mpeg12data.o \
dirac.o dirac.o
OBJS-$(CONFIG_OGG_MUXER) += flac.o flacdata.o OBJS-$(CONFIG_OGG_MUXER) += flac.o flacdata.o
OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_RTPDEC) += mjpeg.o
OBJS-$(CONFIG_SPDIF_DEMUXER) += aacadtsdec.o mpeg4audio.o OBJS-$(CONFIG_SPDIF_DEMUXER) += aacadtsdec.o mpeg4audio.o
OBJS-$(CONFIG_SPDIF_MUXER) += dca.o OBJS-$(CONFIG_SPDIF_MUXER) += dca.o
OBJS-$(CONFIG_TAK_DEMUXER) += tak.o OBJS-$(CONFIG_TAK_DEMUXER) += tak.o
...@@ -703,7 +703,7 @@ OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o ...@@ -703,7 +703,7 @@ OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o
OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o
OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o
OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o
OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o mjpeg.o OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o
OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o
OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o
OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "idctdsp.h" #include "idctdsp.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "jpegtables.h"
#include "mjpeg.h" #include "mjpeg.h"
enum ChunkType { enum ChunkType {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* MJPEG encoder and decoder. * MJPEG encoder and decoder.
*/ */
#include "mjpeg.h" #include "jpegtables.h"
#if 0 #if 0
......
/*
* JPEG-related tables
*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_JPEGTABLES_H
#define AVCODEC_JPEGTABLES_H
#include <stdint.h>
#include "libavutil/internal.h"
extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[];
extern av_export const uint8_t avpriv_mjpeg_val_dc[];
extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[];
extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[];
extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[];
extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[];
extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[];
void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
const uint8_t *bits_table,
const uint8_t *val_table);
#endif /* AVCODEC_JPEGTABLES_H */
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "internal.h" #include "internal.h"
#include "jpegtables.h"
#include "mjpegenc_common.h" #include "mjpegenc_common.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mjpeg.h" #include "mjpeg.h"
......
...@@ -33,10 +33,6 @@ ...@@ -33,10 +33,6 @@
#ifndef AVCODEC_MJPEG_H #ifndef AVCODEC_MJPEG_H
#define AVCODEC_MJPEG_H #define AVCODEC_MJPEG_H
#include "libavutil/internal.h"
#include "avcodec.h"
/* JPEG marker codes */ /* JPEG marker codes */
enum JpegMarker { enum JpegMarker {
/* start of frame */ /* start of frame */
...@@ -131,19 +127,4 @@ enum JpegMarker { ...@@ -131,19 +127,4 @@ enum JpegMarker {
case 7: ret= (left + top)>>1; break;\ case 7: ret= (left + top)>>1; break;\
} }
extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[];
extern av_export const uint8_t avpriv_mjpeg_val_dc[];
extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[];
extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[];
extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[];
extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[];
extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[];
void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
const uint8_t *bits_table,
const uint8_t *val_table);
#endif /* AVCODEC_MJPEG_H */ #endif /* AVCODEC_MJPEG_H */
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "avcodec.h" #include "avcodec.h"
#include "mjpeg.h" #include "jpegtables.h"
static const uint8_t jpeg_header[] = { static const uint8_t jpeg_header[] = {
0xff, 0xd8, // SOI 0xff, 0xd8, // SOI
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "blockdsp.h" #include "blockdsp.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "internal.h" #include "internal.h"
#include "jpegtables.h"
#include "mjpeg.h" #include "mjpeg.h"
#include "mjpegdec.h" #include "mjpegdec.h"
#include "jpeglsdec.h" #include "jpeglsdec.h"
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "avcodec.h" #include "avcodec.h"
#include "jpegtables.h"
#include "mjpegenc_common.h" #include "mjpegenc_common.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mjpeg.h" #include "mjpeg.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "jpegtables.h"
#include "put_bits.h" #include "put_bits.h"
#include "mjpegenc.h" #include "mjpegenc.h"
#include "mjpegenc_common.h" #include "mjpegenc_common.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "rtpdec.h" #include "rtpdec.h"
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavcodec/jpegtables.h"
#include "libavcodec/mjpeg.h" #include "libavcodec/mjpeg.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment