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
aed79007
Commit
aed79007
authored
Aug 27, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg12: add 'scan_offset' private option.
Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET
parent
4bcee8e7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
avcodec.h
libavcodec/avcodec.h
+2
-0
mpeg12enc.c
libavcodec/mpeg12enc.c
+5
-2
mpegvideo.h
libavcodec/mpegvideo.h
+1
-0
options.c
libavcodec/options.c
+2
-0
No files found.
libavcodec/avcodec.h
View file @
aed79007
...
...
@@ -613,7 +613,9 @@ typedef struct RcOverride{
#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
#endif
#define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
#if FF_API_MPEGVIDEO_GLOBAL_OPTS
#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data.
#endif
#define CODEC_FLAG_CLOSED_GOP 0x80000000
#define CODEC_FLAG2_FAST 0x00000001 ///< Allow non spec compliant speedup tricks.
#define CODEC_FLAG2_STRICT_GOP 0x00000002 ///< Strictly enforce GOP size.
...
...
libavcodec/mpeg12enc.c
View file @
aed79007
...
...
@@ -145,6 +145,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
#if FF_API_MPEGVIDEO_GLOBAL_OPTS
if
(
avctx
->
flags2
&
CODEC_FLAG2_DROP_FRAME_TIMECODE
)
s
->
drop_frame_timecode
=
1
;
if
(
avctx
->
flags
&
CODEC_FLAG_SVCD_SCAN_OFFSET
)
s
->
scan_offset
=
1
;
#endif
if
(
find_frame_rate_index
(
s
)
<
0
){
...
...
@@ -420,7 +422,7 @@ void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
put_bits
(
&
s
->
pb
,
1
,
s
->
progressive_frame
);
put_bits
(
&
s
->
pb
,
1
,
0
);
//composite_display_flag
}
if
(
s
->
flags
&
CODEC_FLAG_SVCD_SCAN_OFFSET
)
{
if
(
s
->
scan_offset
)
{
int
i
;
put_header
(
s
,
USER_START_CODE
);
...
...
@@ -936,7 +938,8 @@ static void mpeg1_encode_block(MpegEncContext *s,
#define VE AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM
#define COMMON_OPTS\
{ "intra_vlc", "Use MPEG-2 intra VLC table.", OFFSET(intra_vlc_format), FF_OPT_TYPE_INT, { 0 }, 0, 1, VE },\
{ "drop_frame_timecode", "Timecode is in drop frame format.", OFFSET(drop_frame_timecode), FF_OPT_TYPE_INT, { 0 }, 0, 1, VE},
{ "drop_frame_timecode", "Timecode is in drop frame format.", OFFSET(drop_frame_timecode), FF_OPT_TYPE_INT, { 0 }, 0, 1, VE}, \
{ "scan_offset", "Reserve space for SVCD scan offset user data.", OFFSET(scan_offset), FF_OPT_TYPE_INT, { 0 }, 0, 1, VE },
static
const
AVOption
mpeg1_options
[]
=
{
COMMON_OPTS
...
...
libavcodec/mpegvideo.h
View file @
aed79007
...
...
@@ -645,6 +645,7 @@ typedef struct MpegEncContext {
int
first_slice
;
int
first_field
;
///< is 1 for the first field of a field picture 0 otherwise
int
drop_frame_timecode
;
///< timecode is in drop frame format.
int
scan_offset
;
///< reserve space for SVCD scan offset user data.
/* RTP specific */
int
rtp_mode
;
...
...
libavcodec/options.c
View file @
aed79007
...
...
@@ -115,7 +115,9 @@ static const AVOption options[]={
{
"slice"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG_H263P_SLICE_STRUCT
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
#endif
{
"ilme"
,
"interlaced motion estimation"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG_INTERLACED_ME
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
#if FF_API_MPEGVIDEO_GLOBAL_OPTS
{
"scan_offset"
,
"will reserve space for svcd scan offset user data"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG_SVCD_SCAN_OFFSET
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
#endif
{
"cgop"
,
"closed gop"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG_CLOSED_GOP
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
{
"fast"
,
"allow non spec compliant speedup tricks"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG2_FAST
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags2"
},
{
"sgop"
,
"strictly enforce gop size"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
CODEC_FLAG2_STRICT_GOP
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags2"
},
...
...
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