Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
44754713
Commit
44754713
authored
Sep 26, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/codec/ffmpeg/*: new --ffmpeg-lowres option to force video decoding at a lower resolution.
parent
74392a20
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
14 deletions
+37
-14
modules/codec/ffmpeg/demux.c
modules/codec/ffmpeg/demux.c
+1
-1
modules/codec/ffmpeg/encoder.c
modules/codec/ffmpeg/encoder.c
+7
-2
modules/codec/ffmpeg/ffmpeg.c
modules/codec/ffmpeg/ffmpeg.c
+14
-11
modules/codec/ffmpeg/ffmpeg.h
modules/codec/ffmpeg/ffmpeg.h
+4
-0
modules/codec/ffmpeg/video.c
modules/codec/ffmpeg/video.c
+11
-0
No files found.
modules/codec/ffmpeg/demux.c
View file @
44754713
...
...
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@
netcourrier.com
>
* Gildas Bazin <gbazin@
videolan.org
>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
modules/codec/ffmpeg/encoder.c
View file @
44754713
...
...
@@ -306,6 +306,8 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
if
(
p_enc
->
fmt_in
.
i_cat
==
VIDEO_ES
)
{
int
i_aspect_num
,
i_aspect_den
;
if
(
!
p_enc
->
fmt_in
.
video
.
i_width
||
!
p_enc
->
fmt_in
.
video
.
i_height
)
{
msg_Warn
(
p_enc
,
"invalid size %ix%i"
,
p_enc
->
fmt_in
.
video
.
i_width
,
...
...
@@ -335,11 +337,14 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
p_context
->
b_frame_strategy
=
0
;
#if LIBAVCODEC_BUILD >= 4687
av_reduce
(
&
i_aspect_num
,
&
i_aspect_den
,
p_enc
->
fmt_in
.
video
.
i_aspect
,
VOUT_ASPECT_FACTOR
,
1
<<
30
/* something big */
);
av_reduce
(
&
p_context
->
sample_aspect_ratio
.
num
,
&
p_context
->
sample_aspect_ratio
.
den
,
p_enc
->
fmt_in
.
video
.
i_aspect
*
i_aspect_num
*
(
int64_t
)
p_context
->
height
/
p_context
->
width
,
VOUT_ASPECT_FACTOR
,
1
<<
30
/* something big */
);
i_aspect_den
,
1
<<
30
/* something big */
);
#else
p_context
->
aspect_ratio
=
((
float
)
p_enc
->
fmt_in
.
video
.
i_aspect
)
/
VOUT_ASPECT_FACTOR
;
...
...
modules/codec/ffmpeg/ffmpeg.c
View file @
44754713
...
...
@@ -98,6 +98,9 @@ vlc_module_begin();
VLC_FALSE
);
add_integer
(
"ffmpeg-vismv"
,
0
,
NULL
,
VISMV_TEXT
,
VISMV_LONGTEXT
,
VLC_TRUE
);
add_integer
(
"ffmpeg-lowres"
,
0
,
NULL
,
LOWRES_TEXT
,
LOWRES_LONGTEXT
,
VLC_TRUE
);
change_integer_range
(
0
,
2
);
#ifdef LIBAVCODEC_PP
add_integer
(
"ffmpeg-pp-q"
,
0
,
NULL
,
PP_Q_TEXT
,
PP_Q_LONGTEXT
,
VLC_FALSE
);
...
...
@@ -270,16 +273,6 @@ static void CloseDecoder( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
if
(
p_sys
->
p_context
)
{
if
(
p_sys
->
p_context
->
extradata
)
free
(
p_sys
->
p_context
->
extradata
);
avcodec_close
(
p_sys
->
p_context
);
msg_Dbg
(
p_dec
,
"ffmpeg codec (%s) stopped"
,
p_sys
->
psz_namecodec
);
av_free
(
p_sys
->
p_context
);
}
switch
(
p_sys
->
i_cat
)
{
case
AUDIO_ES
:
...
...
@@ -290,9 +283,19 @@ static void CloseDecoder( vlc_object_t *p_this )
break
;
}
if
(
p_sys
->
p_context
)
{
if
(
p_sys
->
p_context
->
extradata
)
free
(
p_sys
->
p_context
->
extradata
);
avcodec_close
(
p_sys
->
p_context
);
msg_Dbg
(
p_dec
,
"ffmpeg codec (%s) stopped"
,
p_sys
->
psz_namecodec
);
av_free
(
p_sys
->
p_context
);
}
free
(
p_sys
);
}
/*****************************************************************************
* local Functions
*****************************************************************************/
...
...
modules/codec/ffmpeg/ffmpeg.h
View file @
44754713
...
...
@@ -124,6 +124,10 @@ void E_(ClosePostproc)( decoder_t *, void * );
"2 - visualize forward predicted MVs of B frames\n" \
"4 - visualize backward predicted MVs of B frames" )
#define LOWRES_TEXT N_( "Low resolution decoding" )
#define LOWRES_LONGTEXT N_( "Will only decode a low resolution version of " \
"the video." )
#define LIBAVCODEC_PP_TEXT N_("ffmpeg post processing filter chains")
/* FIXME (cut/past from ffmpeg */
#define LIBAVCODEC_PP_LONGTEXT \
...
...
modules/codec/ffmpeg/video.c
View file @
44754713
...
...
@@ -152,6 +152,11 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
return
NULL
;
/* invalid display size */
}
#if LIBAVCODEC_BUILD >= 4723
p_dec
->
fmt_out
.
video
.
i_width
>>=
p_context
->
lowres
;
p_dec
->
fmt_out
.
video
.
i_height
>>=
p_context
->
lowres
;
#endif
if
(
!
p_dec
->
fmt_out
.
i_codec
)
{
/* we make conversion if possible*/
...
...
@@ -245,6 +250,12 @@ int E_(InitVideoDec)( decoder_t *p_dec, AVCodecContext *p_context,
if
(
val
.
i_int
)
p_sys
->
p_context
->
debug_mv
=
val
.
i_int
;
#endif
var_Create
(
p_dec
,
"ffmpeg-lowres"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
var_Get
(
p_dec
,
"ffmpeg-lowres"
,
&
val
);
#if LIBAVCODEC_BUILD >= 4723
if
(
val
.
i_int
>
0
&&
val
.
i_int
<=
2
)
p_sys
->
p_context
->
lowres
=
val
.
i_int
;
#endif
/* ***** ffmpeg frame skipping ***** */
var_Create
(
p_dec
,
"ffmpeg-hurry-up"
,
VLC_VAR_BOOL
|
VLC_VAR_DOINHERIT
);
var_Get
(
p_dec
,
"ffmpeg-hurry-up"
,
&
val
);
...
...
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