Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
dc6ea00c
Commit
dc6ea00c
authored
Oct 28, 2013
by
Vittorio Giovara
Committed by
Diego Biurrun
Nov 01, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg4video: K&R formatting cosmetics
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
037fea38
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
49 deletions
+54
-49
mpeg4video.c
libavcodec/mpeg4video.c
+0
-0
mpeg4video.h
libavcodec/mpeg4video.h
+54
-49
No files found.
libavcodec/mpeg4video.c
View file @
dc6ea00c
This diff is collapsed.
Click to expand it.
libavcodec/mpeg4video.h
View file @
dc6ea00c
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
#define AVCODEC_MPEG4VIDEO_H
#define AVCODEC_MPEG4VIDEO_H
#include <stdint.h>
#include <stdint.h>
#include "get_bits.h"
#include "get_bits.h"
#include "mpegvideo.h"
#include "mpegvideo.h"
#include "rl.h"
#include "rl.h"
...
@@ -34,13 +35,13 @@
...
@@ -34,13 +35,13 @@
#define BIN_ONLY_SHAPE 2
#define BIN_ONLY_SHAPE 2
#define GRAY_SHAPE 3
#define GRAY_SHAPE 3
#define SIMPLE_VO_TYPE
1
#define SIMPLE_VO_TYPE 1
#define CORE_VO_TYPE
3
#define CORE_VO_TYPE 3
#define MAIN_VO_TYPE
4
#define MAIN_VO_TYPE 4
#define NBIT_VO_TYPE
5
#define NBIT_VO_TYPE 5
#define ARTS_VO_TYPE
10
#define ARTS_VO_TYPE 10
#define ACE_VO_TYPE
12
#define ACE_VO_TYPE 12
#define ADV_SIMPLE_VO_TYPE
17
#define ADV_SIMPLE_VO_TYPE 17
// aspect_ratio_info
// aspect_ratio_info
#define EXTENDED_PAR 15
#define EXTENDED_PAR 15
...
@@ -88,15 +89,15 @@ extern const uint8_t ff_mpeg4_dc_threshold[8];
...
@@ -88,15 +89,15 @@ extern const uint8_t ff_mpeg4_dc_threshold[8];
void
ff_mpeg4_encode_mb
(
MpegEncContext
*
s
,
void
ff_mpeg4_encode_mb
(
MpegEncContext
*
s
,
int16_t
block
[
6
][
64
],
int16_t
block
[
6
][
64
],
int
motion_x
,
int
motion_y
);
int
motion_x
,
int
motion_y
);
void
ff_mpeg4_pred_ac
(
MpegEncContext
*
s
,
int16_t
*
block
,
int
n
,
void
ff_mpeg4_pred_ac
(
MpegEncContext
*
s
,
int16_t
*
block
,
int
n
,
int
dir
);
int
dir
);
void
ff_set_mpeg4_time
(
MpegEncContext
*
s
);
void
ff_set_mpeg4_time
(
MpegEncContext
*
s
);
void
ff_mpeg4_encode_picture_header
(
MpegEncContext
*
s
,
int
picture_number
);
void
ff_mpeg4_encode_picture_header
(
MpegEncContext
*
s
,
int
picture_number
);
int
ff_mpeg4_decode_picture_header
(
MpegEncContext
*
s
,
GetBitContext
*
gb
);
int
ff_mpeg4_decode_picture_header
(
MpegEncContext
*
s
,
GetBitContext
*
gb
);
void
ff_mpeg4_encode_video_packet_header
(
MpegEncContext
*
s
);
void
ff_mpeg4_encode_video_packet_header
(
MpegEncContext
*
s
);
void
ff_mpeg4_clean_buffers
(
MpegEncContext
*
s
);
void
ff_mpeg4_clean_buffers
(
MpegEncContext
*
s
);
void
ff_mpeg4_stuffing
(
PutBitContext
*
pbc
);
void
ff_mpeg4_stuffing
(
PutBitContext
*
pbc
);
void
ff_mpeg4_init_partitions
(
MpegEncContext
*
s
);
void
ff_mpeg4_init_partitions
(
MpegEncContext
*
s
);
void
ff_mpeg4_merge_partitions
(
MpegEncContext
*
s
);
void
ff_mpeg4_merge_partitions
(
MpegEncContext
*
s
);
void
ff_clean_mpeg4_qscales
(
MpegEncContext
*
s
);
void
ff_clean_mpeg4_qscales
(
MpegEncContext
*
s
);
...
@@ -111,8 +112,7 @@ void ff_mpeg4_init_direct_mv(MpegEncContext *s);
...
@@ -111,8 +112,7 @@ void ff_mpeg4_init_direct_mv(MpegEncContext *s);
*/
*/
int
ff_mpeg4_set_direct_mv
(
MpegEncContext
*
s
,
int
mx
,
int
my
);
int
ff_mpeg4_set_direct_mv
(
MpegEncContext
*
s
,
int
mx
,
int
my
);
extern
uint8_t
ff_mpeg4_static_rl_table_store
[
3
][
2
][
2
*
MAX_RUN
+
MAX_LEVEL
+
3
];
extern
uint8_t
ff_mpeg4_static_rl_table_store
[
3
][
2
][
2
*
MAX_RUN
+
MAX_LEVEL
+
3
];
#if 0 //3IV1 is quite rare and it slows things down a tiny bit
#if 0 //3IV1 is quite rare and it slows things down a tiny bit
#define IS_3IV1 s->codec_tag == AV_RL32("3IV1")
#define IS_3IV1 s->codec_tag == AV_RL32("3IV1")
...
@@ -120,7 +120,6 @@ extern uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
...
@@ -120,7 +120,6 @@ extern uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
#define IS_3IV1 0
#define IS_3IV1 0
#endif
#endif
/**
/**
* Predict the dc.
* Predict the dc.
* encoding quantized level -> quantized diff
* encoding quantized level -> quantized diff
...
@@ -128,75 +127,81 @@ extern uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
...
@@ -128,75 +127,81 @@ extern uint8_t ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
* @param n block index (0-3 are luma, 4-5 are chroma)
* @param n block index (0-3 are luma, 4-5 are chroma)
* @param dir_ptr pointer to an integer where the prediction direction will be stored
* @param dir_ptr pointer to an integer where the prediction direction will be stored
*/
*/
static
inline
int
ff_mpeg4_pred_dc
(
MpegEncContext
*
s
,
int
n
,
int
level
,
int
*
dir_ptr
,
int
encoding
)
static
inline
int
ff_mpeg4_pred_dc
(
MpegEncContext
*
s
,
int
n
,
int
level
,
int
*
dir_ptr
,
int
encoding
)
{
{
int
a
,
b
,
c
,
wrap
,
pred
,
scale
,
ret
;
int
a
,
b
,
c
,
wrap
,
pred
,
scale
,
ret
;
int16_t
*
dc_val
;
int16_t
*
dc_val
;
/* find prediction */
/* find prediction */
if
(
n
<
4
)
{
if
(
n
<
4
)
scale
=
s
->
y_dc_scale
;
scale
=
s
->
y_dc_scale
;
}
else
{
else
scale
=
s
->
c_dc_scale
;
scale
=
s
->
c_dc_scale
;
}
if
(
IS_3IV1
)
if
(
IS_3IV1
)
scale
=
8
;
scale
=
8
;
wrap
=
s
->
block_wrap
[
n
];
wrap
=
s
->
block_wrap
[
n
];
dc_val
=
s
->
dc_val
[
0
]
+
s
->
block_index
[
n
];
dc_val
=
s
->
dc_val
[
0
]
+
s
->
block_index
[
n
];
/* B C
/* B C
* A X
* A X
*/
*/
a
=
dc_val
[
-
1
];
a
=
dc_val
[
-
1
];
b
=
dc_val
[
-
1
-
wrap
];
b
=
dc_val
[
-
1
-
wrap
];
c
=
dc_val
[
-
wrap
];
c
=
dc_val
[
-
wrap
];
/* outside slice handling (we can't do that by memset as we need the dc for error resilience) */
/* outside slice handling (we can't do that by memset as we need the
if
(
s
->
first_slice_line
&&
n
!=
3
){
* dc for error resilience) */
if
(
n
!=
2
)
b
=
c
=
1024
;
if
(
s
->
first_slice_line
&&
n
!=
3
)
{
if
(
n
!=
1
&&
s
->
mb_x
==
s
->
resync_mb_x
)
b
=
a
=
1024
;
if
(
n
!=
2
)
b
=
c
=
1024
;
if
(
n
!=
1
&&
s
->
mb_x
==
s
->
resync_mb_x
)
b
=
a
=
1024
;
}
}
if
(
s
->
mb_x
==
s
->
resync_mb_x
&&
s
->
mb_y
==
s
->
resync_mb_y
+
1
)
{
if
(
s
->
mb_x
==
s
->
resync_mb_x
&&
s
->
mb_y
==
s
->
resync_mb_y
+
1
)
{
if
(
n
==
0
||
n
==
4
||
n
==
5
)
if
(
n
==
0
||
n
==
4
||
n
==
5
)
b
=
1024
;
b
=
1024
;
}
}
if
(
abs
(
a
-
b
)
<
abs
(
b
-
c
))
{
if
(
abs
(
a
-
b
)
<
abs
(
b
-
c
))
{
pred
=
c
;
pred
=
c
;
*
dir_ptr
=
1
;
/* top */
*
dir_ptr
=
1
;
/* top */
}
else
{
}
else
{
pred
=
a
;
pred
=
a
;
*
dir_ptr
=
0
;
/* left */
*
dir_ptr
=
0
;
/* left */
}
}
/* we assume pred is positive */
/* we assume pred is positive */
pred
=
FASTDIV
((
pred
+
(
scale
>>
1
)),
scale
);
pred
=
FASTDIV
((
pred
+
(
scale
>>
1
)),
scale
);
if
(
encoding
)
{
if
(
encoding
)
{
ret
=
level
-
pred
;
ret
=
level
-
pred
;
}
else
{
}
else
{
level
+=
pred
;
level
+=
pred
;
ret
=
level
;
ret
=
level
;
if
(
s
->
err_recognition
&
AV_EF_BITSTREAM
){
if
(
s
->
err_recognition
&
AV_EF_BITSTREAM
)
{
if
(
level
<
0
){
if
(
level
<
0
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"dc<0 at %dx%d
\n
"
,
s
->
mb_x
,
s
->
mb_y
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"dc<0 at %dx%d
\n
"
,
s
->
mb_x
,
s
->
mb_y
);
return
-
1
;
return
-
1
;
}
}
if
(
level
*
scale
>
2048
+
scale
){
if
(
level
*
scale
>
2048
+
scale
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"dc overflow at %dx%d
\n
"
,
s
->
mb_x
,
s
->
mb_y
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"dc overflow at %dx%d
\n
"
,
s
->
mb_x
,
s
->
mb_y
);
return
-
1
;
return
-
1
;
}
}
}
}
}
}
level
*=
scale
;
level
*=
scale
;
if
(
level
&
(
~
2047
))
{
if
(
level
&
(
~
2047
))
{
if
(
level
<
0
)
if
(
level
<
0
)
level
=
0
;
level
=
0
;
else
if
(
!
(
s
->
workaround_bugs
&
FF_BUG_DC_CLIP
))
else
if
(
!
(
s
->
workaround_bugs
&
FF_BUG_DC_CLIP
))
level
=
2047
;
level
=
2047
;
}
}
dc_val
[
0
]
=
level
;
dc_val
[
0
]
=
level
;
return
ret
;
return
ret
;
}
}
#endif
/* AVCODEC_MPEG4VIDEO_H */
#endif
/* AVCODEC_MPEG4VIDEO_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