Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
4978850c
Commit
4978850c
authored
Mar 27, 2015
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: Split JPEG-related tables off into a separate component
parent
87f87ccf
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
66 additions
and
32 deletions
+66
-32
configure
configure
+9
-5
Makefile
libavcodec/Makefile
+6
-6
g2meet.c
libavcodec/g2meet.c
+1
-0
jpegtables.c
libavcodec/jpegtables.c
+1
-1
jpegtables.h
libavcodec/jpegtables.h
+43
-0
ljpegenc.c
libavcodec/ljpegenc.c
+1
-0
mjpeg.h
libavcodec/mjpeg.h
+0
-19
mjpeg2jpeg_bsf.c
libavcodec/mjpeg2jpeg_bsf.c
+1
-1
mjpegdec.c
libavcodec/mjpegdec.c
+1
-0
mjpegenc.c
libavcodec/mjpegenc.c
+1
-0
mjpegenc_common.c
libavcodec/mjpegenc_common.c
+1
-0
rtpdec_jpeg.c
libavformat/rtpdec_jpeg.c
+1
-0
No files found.
configure
View file @
4978850c
...
...
@@ -1590,6 +1590,7 @@ CONFIG_EXTRA="
iirfilter
imdct15
intrax8
jpegtables
lgplv3
lpc
me_cmp
...
...
@@ -1826,7 +1827,7 @@ flv_encoder_select="h263_encoder"
fourxm_decoder_select
=
"blockdsp bswapdsp"
fraps_decoder_select
=
"bswapdsp huffman"
g2m_decoder_deps
=
"zlib"
g2m_decoder_select
=
"blockdsp idctdsp"
g2m_decoder_select
=
"blockdsp idctdsp
jpegtables
"
h261_decoder_select
=
"mpeg_er mpegvideo"
h261_encoder_select
=
"aandcttables mpegvideoenc"
h263_decoder_select
=
"error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp"
...
...
@@ -1850,13 +1851,13 @@ jpegls_decoder_select="golomb mjpeg_decoder"
jpegls_encoder_select
=
"golomb"
jv_decoder_select
=
"blockdsp"
lagarith_decoder_select
=
"huffyuvdsp"
ljpeg_encoder_select
=
"aandcttables idctdsp"
ljpeg_encoder_select
=
"aandcttables idctdsp
jpegtables
"
loco_decoder_select
=
"golomb"
mdec_decoder_select
=
"blockdsp idctdsp mpegvideo"
metasound_decoder_select
=
"lsp mdct sinewin"
mimic_decoder_select
=
"blockdsp bswapdsp hpeldsp idctdsp"
mjpeg_decoder_select
=
"blockdsp hpeldsp idctdsp"
mjpeg_encoder_select
=
"aandcttables mpegvideoenc"
mjpeg_decoder_select
=
"blockdsp hpeldsp idctdsp
jpegtables
"
mjpeg_encoder_select
=
"aandcttables
jpegtables
mpegvideoenc"
mjpegb_decoder_select
=
"mjpeg_decoder"
mlp_decoder_select
=
"mlp_parser"
motionpixels_decoder_select
=
"bswapdsp"
...
...
@@ -2017,6 +2018,9 @@ mpegvideo_parser_select="mpegvideo"
mpeg4video_parser_select
=
"error_resilience h263dsp mpeg_er mpegvideo qpeldsp"
vc1_parser_select
=
"mpegvideo startcode vc1_decoder"
# bitstream_filters
mjpeg2jpeg_bsf_select
=
"jpegtables"
# external libraries
libdcadec_decoder_deps
=
"libdcadec"
libfaac_encoder_deps
=
"libfaac"
...
...
@@ -2107,7 +2111,7 @@ ogg_demuxer_select="golomb"
opus_muxer_select
=
"ogg_muxer"
psp_muxer_select
=
"mov_muxer"
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_muxer_select
=
"rtp_muxer http_protocol rtp_protocol rtpenc_chain"
sap_demuxer_select
=
"sdp_demuxer"
...
...
libavcodec/Makefile
View file @
4978850c
...
...
@@ -61,6 +61,7 @@ OBJS-$(CONFIG_IDCTDSP) += idctdsp.o simple_idct.o jrevdct.o
OBJS-$(CONFIG_IIRFILTER)
+=
iirfilter.o
OBJS-$(CONFIG_IMDCT15)
+=
imdct15.o
OBJS-$(CONFIG_INTRAX8)
+=
intrax8.o
intrax8dsp.o
OBJS-$(CONFIG_JPEGTABLES)
+=
jpegtables.o
OBJS-$(CONFIG_LIBXVID)
+=
libxvid_rc.o
OBJS-$(CONFIG_LPC)
+=
lpc.o
OBJS-$(CONFIG_LSP)
+=
lsp.o
...
...
@@ -206,7 +207,7 @@ OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o
OBJS-$(CONFIG_FOURXM_DECODER)
+=
4xm.o
OBJS-$(CONFIG_FRAPS_DECODER)
+=
fraps.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
\
celp_filters.o
OBJS-$(CONFIG_GIF_DECODER)
+=
gifdec.o
lzw.o
...
...
@@ -252,7 +253,7 @@ OBJS-$(CONFIG_JV_DECODER) += jvdec.o
OBJS-$(CONFIG_KGV1_DECODER)
+=
kgv1dec.o
OBJS-$(CONFIG_KMVC_DECODER)
+=
kmvc.o
OBJS-$(CONFIG_LAGARITH_DECODER)
+=
lagarith.o
lagarithrac.o
OBJS-$(CONFIG_LJPEG_ENCODER)
+=
ljpegenc.o
mjpeg
.o
mjpeg
enc_common.o
OBJS-$(CONFIG_LJPEG_ENCODER)
+=
ljpegenc.o
mjpegenc_common.o
OBJS-$(CONFIG_LOCO_DECODER)
+=
loco.o
OBJS-$(CONFIG_MACE3_DECODER)
+=
mace.o
OBJS-$(CONFIG_MACE6_DECODER)
+=
mace.o
...
...
@@ -260,8 +261,8 @@ OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o
OBJS-$(CONFIG_METASOUND_DECODER)
+=
metasound.o
metasound_data.o
\
twinvq.o
OBJS-$(CONFIG_MIMIC_DECODER)
+=
mimic.o
OBJS-$(CONFIG_MJPEG_DECODER)
+=
mjpegdec.o
mjpeg.o
OBJS-$(CONFIG_MJPEG_ENCODER)
+=
mjpegenc.o
mjpeg
.o
mjpeg
enc_common.o
OBJS-$(CONFIG_MJPEG_DECODER)
+=
mjpegdec.o
OBJS-$(CONFIG_MJPEG_ENCODER)
+=
mjpegenc.o
mjpegenc_common.o
OBJS-$(CONFIG_MJPEGB_DECODER)
+=
mjpegbdec.o
OBJS-$(CONFIG_MLP_DECODER)
+=
mlpdec.o
mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER)
+=
mmvideo.o
...
...
@@ -602,7 +603,6 @@ OBJS-$(CONFIG_OGG_DEMUXER) += mpeg12data.o \
dirac.o
OBJS-$(CONFIG_OGG_MUXER)
+=
flac.o
flacdata.o
OBJS-$(CONFIG_RTP_MUXER)
+=
mpeg4audio.o
OBJS-$(CONFIG_RTPDEC)
+=
mjpeg.o
OBJS-$(CONFIG_SPDIF_DEMUXER)
+=
aacadtsdec.o
mpeg4audio.o
OBJS-$(CONFIG_SPDIF_MUXER)
+=
dca.o
OBJS-$(CONFIG_TAK_DEMUXER)
+=
tak.o
...
...
@@ -703,7 +703,7 @@ OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o
OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)
+=
dump_extradata_bsf.o
OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)
+=
h264_mp4toannexb_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_MOV2TEXTSUB_BSF)
+=
movsub_bsf.o
OBJS-$(CONFIG_NOISE_BSF)
+=
noise_bsf.o
...
...
libavcodec/g2meet.c
View file @
4978850c
...
...
@@ -34,6 +34,7 @@
#include "idctdsp.h"
#include "get_bits.h"
#include "internal.h"
#include "jpegtables.h"
#include "mjpeg.h"
enum
ChunkType
{
...
...
libavcodec/
mjpeg
.c
→
libavcodec/
jpegtables
.c
View file @
4978850c
...
...
@@ -30,7 +30,7 @@
* MJPEG encoder and decoder.
*/
#include "
mjpeg
.h"
#include "
jpegtables
.h"
#if 0
...
...
libavcodec/jpegtables.h
0 → 100644
View file @
4978850c
/*
* 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 */
libavcodec/ljpegenc.c
View file @
4978850c
...
...
@@ -37,6 +37,7 @@
#include "avcodec.h"
#include "idctdsp.h"
#include "internal.h"
#include "jpegtables.h"
#include "mjpegenc_common.h"
#include "mpegvideo.h"
#include "mjpeg.h"
...
...
libavcodec/mjpeg.h
View file @
4978850c
...
...
@@ -33,10 +33,6 @@
#ifndef AVCODEC_MJPEG_H
#define AVCODEC_MJPEG_H
#include "libavutil/internal.h"
#include "avcodec.h"
/* JPEG marker codes */
enum
JpegMarker
{
/* start of frame */
...
...
@@ -131,19 +127,4 @@ enum JpegMarker {
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 */
libavcodec/mjpeg2jpeg_bsf.c
View file @
4978850c
...
...
@@ -30,7 +30,7 @@
#include "libavutil/mem.h"
#include "avcodec.h"
#include "
mjpeg
.h"
#include "
jpegtables
.h"
static
const
uint8_t
jpeg_header
[]
=
{
0xff
,
0xd8
,
// SOI
...
...
libavcodec/mjpegdec.c
View file @
4978850c
...
...
@@ -38,6 +38,7 @@
#include "blockdsp.h"
#include "idctdsp.h"
#include "internal.h"
#include "jpegtables.h"
#include "mjpeg.h"
#include "mjpegdec.h"
#include "jpeglsdec.h"
...
...
libavcodec/mjpegenc.c
View file @
4978850c
...
...
@@ -35,6 +35,7 @@
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "jpegtables.h"
#include "mjpegenc_common.h"
#include "mpegvideo.h"
#include "mjpeg.h"
...
...
libavcodec/mjpegenc_common.c
View file @
4978850c
...
...
@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "idctdsp.h"
#include "jpegtables.h"
#include "put_bits.h"
#include "mjpegenc.h"
#include "mjpegenc_common.h"
...
...
libavformat/rtpdec_jpeg.c
View file @
4978850c
...
...
@@ -24,6 +24,7 @@
#include "rtpdec.h"
#include "rtpdec_formats.h"
#include "libavutil/intreadwrite.h"
#include "libavcodec/jpegtables.h"
#include "libavcodec/mjpeg.h"
#include "libavcodec/bytestream.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment