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
e6e3dcba
Commit
e6e3dcba
authored
Mar 27, 2015
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpeg: Move code only used in the encoder(s) to the appropriate header
parent
6ed38b1f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
7 deletions
+10
-7
jpeglsenc.c
libavcodec/jpeglsenc.c
+1
-0
mjpeg.h
libavcodec/mjpeg.h
+0
-7
mjpegdec.c
libavcodec/mjpegdec.c
+1
-0
mjpegenc.h
libavcodec/mjpegenc.h
+7
-0
mjpegenc_common.c
libavcodec/mjpegenc_common.c
+1
-0
No files found.
libavcodec/jpeglsenc.c
View file @
e6e3dcba
...
...
@@ -31,6 +31,7 @@
#include "internal.h"
#include "mathops.h"
#include "mjpeg.h"
#include "mjpegenc.h"
#include "jpegls.h"
/**
...
...
libavcodec/mjpeg.h
View file @
e6e3dcba
...
...
@@ -36,7 +36,6 @@
#include "libavutil/internal.h"
#include "avcodec.h"
#include "put_bits.h"
/* JPEG marker codes */
typedef
enum
{
...
...
@@ -120,12 +119,6 @@ typedef enum {
/* 0x02 -> 0xbf reserved */
}
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)\
switch(predictor){\
case 1: ret= left; break;\
...
...
libavcodec/mjpegdec.c
View file @
e6e3dcba
...
...
@@ -41,6 +41,7 @@
#include "mjpeg.h"
#include "mjpegdec.h"
#include "jpeglsdec.h"
#include "put_bits.h"
static
int
build_vlc
(
VLC
*
vlc
,
const
uint8_t
*
bits_table
,
...
...
libavcodec/mjpegenc.h
View file @
e6e3dcba
...
...
@@ -36,6 +36,7 @@
#include <stdint.h>
#include "mpegvideo.h"
#include "put_bits.h"
typedef
struct
MJpegContext
{
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
];
}
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
);
void
ff_mjpeg_encode_close
(
MpegEncContext
*
s
);
void
ff_mjpeg_encode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
8
][
64
]);
...
...
libavcodec/mjpegenc_common.c
View file @
e6e3dcba
...
...
@@ -28,6 +28,7 @@
#include "avcodec.h"
#include "idctdsp.h"
#include "put_bits.h"
#include "mjpegenc.h"
#include "mjpegenc_common.h"
#include "mjpeg.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