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
fdc91863
Commit
fdc91863
authored
Apr 14, 2012
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libschroedinger: Switch to function names more in line with Libav style.
parent
9cef0669
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
libschroedinger.c
libavcodec/libschroedinger.c
+2
-2
libschroedingerdec.c
libavcodec/libschroedingerdec.c
+5
-5
libschroedingerenc.c
libavcodec/libschroedingerenc.c
+5
-5
No files found.
libavcodec/libschroedinger.c
View file @
fdc91863
...
...
@@ -163,7 +163,7 @@ int ff_get_schro_frame_format (SchroChromaFormat schro_pix_fmt,
return
-
1
;
}
static
void
FreeSchroF
rame
(
SchroFrame
*
frame
,
void
*
priv
)
static
void
free_schro_f
rame
(
SchroFrame
*
frame
,
void
*
priv
)
{
AVPicture
*
p_pic
=
priv
;
...
...
@@ -195,7 +195,7 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
p_frame
->
format
=
schro_frame_fmt
;
p_frame
->
width
=
y_width
;
p_frame
->
height
=
y_height
;
schro_frame_set_free_callback
(
p_frame
,
FreeSchroF
rame
,
(
void
*
)
p_pic
);
schro_frame_set_free_callback
(
p_frame
,
free_schro_f
rame
,
(
void
*
)
p_pic
);
for
(
i
=
0
;
i
<
3
;
++
i
)
{
p_frame
->
components
[
i
].
width
=
i
?
uv_width
:
y_width
;
...
...
libavcodec/libschroedingerdec.c
View file @
fdc91863
...
...
@@ -75,14 +75,14 @@ static void libschroedinger_decode_buffer_free(SchroBuffer *schro_buf,
av_freep
(
&
priv
);
}
static
void
SchroParseContextI
nit
(
SchroParseUnitContext
*
parse_ctx
,
const
uint8_t
*
buf
,
int
buf_size
)
static
void
parse_context_i
nit
(
SchroParseUnitContext
*
parse_ctx
,
const
uint8_t
*
buf
,
int
buf_size
)
{
parse_ctx
->
buf
=
buf
;
parse_ctx
->
buf_size
=
buf_size
;
}
static
SchroBuffer
*
FindNextSchroParseU
nit
(
SchroParseUnitContext
*
parse_ctx
)
static
SchroBuffer
*
find_next_parse_u
nit
(
SchroParseUnitContext
*
parse_ctx
)
{
SchroBuffer
*
enc_buf
=
NULL
;
int
next_pu_offset
=
0
;
...
...
@@ -219,7 +219,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
*
data_size
=
0
;
SchroParseContextI
nit
(
&
parse_ctx
,
buf
,
buf_size
);
parse_context_i
nit
(
&
parse_ctx
,
buf
,
buf_size
);
if
(
!
buf_size
)
{
if
(
!
p_schro_params
->
eos_signalled
)
{
state
=
schro_decoder_push_end_of_stream
(
decoder
);
...
...
@@ -229,7 +229,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext,
/* Loop through all the individual parse units in the input buffer */
do
{
if
((
enc_buf
=
FindNextSchroParseU
nit
(
&
parse_ctx
)))
{
if
((
enc_buf
=
find_next_parse_u
nit
(
&
parse_ctx
)))
{
/* Push buffer into decoder. */
if
(
SCHRO_PARSE_CODE_IS_PICTURE
(
enc_buf
->
data
[
4
])
&&
SCHRO_PARSE_CODE_NUM_REFS
(
enc_buf
->
data
[
4
])
>
0
)
...
...
libavcodec/libschroedingerenc.c
View file @
fdc91863
...
...
@@ -79,7 +79,7 @@ typedef struct SchroEncoderParams {
/**
* Works out Schro-compatible chroma format.
*/
static
int
SetSchroChromaF
ormat
(
AVCodecContext
*
avccontext
)
static
int
set_chroma_f
ormat
(
AVCodecContext
*
avccontext
)
{
int
num_formats
=
sizeof
(
schro_pixel_format_map
)
/
sizeof
(
schro_pixel_format_map
[
0
]);
...
...
@@ -128,7 +128,7 @@ static int libschroedinger_encode_init(AVCodecContext *avccontext)
p_schro_params
->
format
->
width
=
avccontext
->
width
;
p_schro_params
->
format
->
height
=
avccontext
->
height
;
if
(
SetSchroChromaF
ormat
(
avccontext
)
==
-
1
)
if
(
set_chroma_f
ormat
(
avccontext
)
==
-
1
)
return
-
1
;
if
(
avccontext
->
color_primaries
==
AVCOL_PRI_BT709
)
{
...
...
@@ -258,7 +258,7 @@ static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avccontext,
return
in_frame
;
}
static
void
SchroedingerFreeF
rame
(
void
*
data
)
static
void
libschroedinger_free_f
rame
(
void
*
data
)
{
FFSchroEncodedFrame
*
enc_frame
=
data
;
...
...
@@ -411,7 +411,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext, AVPacket *pk
error:
/* free frame */
SchroedingerFreeF
rame
(
p_frame_output
);
libschroedinger_free_f
rame
(
p_frame_output
);
return
ret
;
}
...
...
@@ -425,7 +425,7 @@ static int libschroedinger_encode_close(AVCodecContext *avccontext)
/* Free data in the output frame queue. */
ff_schro_queue_free
(
&
p_schro_params
->
enc_frame_queue
,
SchroedingerFreeF
rame
);
libschroedinger_free_f
rame
);
/* Free the encoder buffer. */
...
...
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