History

libschroedinger: Switch to function names more in line with Libav style.

Diego Biurrun committed 14 years ago

Commit fdc91861 parent 9cef0663 files · +12 −12Browse files

Unified · Split

3 files
  1. libavcodec/libschroedinger.c +2 −2
  2. libavcodec/libschroedingerdec.c +5 −5
  3. libavcodec/libschroedingerenc.c +5 −5
libavcodec/libschroedinger.c+2−2
@@ -163,7 +163,7 @@ int ff_get_schro_frame_format (SchroChromaFormat schro_pix_fmt, · 162 unmodified lines
163163 return -1;
164164 }
165165
166−static void FreeSchroFrame(SchroFrame *frame, void *priv)
166+static void free_schro_frame(SchroFrame *frame, void *priv)
167167 {
168168 AVPicture *p_pic = priv;
169169
@@ -195,7 +195,7 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext, · 25 unmodified lines
195195 p_frame->format = schro_frame_fmt;
196196 p_frame->width = y_width;
197197 p_frame->height = y_height;
198− schro_frame_set_free_callback(p_frame, FreeSchroFrame, (void *)p_pic);
198+ schro_frame_set_free_callback(p_frame, free_schro_frame, (void *)p_pic);
199199
200200 for (i = 0; i < 3; ++i) {
201201 p_frame->components[i].width = i ? uv_width : y_width;
libavcodec/libschroedingerdec.c+5−5
@@ -75,14 +75,14 @@ static void libschroedinger_decode_buffer_free(SchroBuffer *schro_buf, · 74 unmodified lines
7575 av_freep(&priv);
7676 }
7777
78−static void SchroParseContextInit(SchroParseUnitContext *parse_ctx,
79− const uint8_t *buf, int buf_size)
78+static void parse_context_init(SchroParseUnitContext *parse_ctx,
79+ const uint8_t *buf, int buf_size)
8080 {
8181 parse_ctx->buf = buf;
8282 parse_ctx->buf_size = buf_size;
8383 }
8484
85−static SchroBuffer *FindNextSchroParseUnit(SchroParseUnitContext *parse_ctx)
85+static SchroBuffer *find_next_parse_unit(SchroParseUnitContext *parse_ctx)
8686 {
8787 SchroBuffer *enc_buf = NULL;
8888 int next_pu_offset = 0;
@@ -219,7 +219,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, · 130 unmodified lines
219219
220220 *data_size = 0;
221221
222− SchroParseContextInit(&parse_ctx, buf, buf_size);
222+ parse_context_init(&parse_ctx, buf, buf_size);
223223 if (!buf_size) {
224224 if (!p_schro_params->eos_signalled) {
225225 state = schro_decoder_push_end_of_stream(decoder);
@@ -229,7 +229,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avccontext, · 3 unmodified lines
229229
230230 /* Loop through all the individual parse units in the input buffer */
231231 do {
232− if ((enc_buf = FindNextSchroParseUnit(&parse_ctx))) {
232+ if ((enc_buf = find_next_parse_unit(&parse_ctx))) {
233233 /* Push buffer into decoder. */
234234 if (SCHRO_PARSE_CODE_IS_PICTURE(enc_buf->data[4]) &&
235235 SCHRO_PARSE_CODE_NUM_REFS(enc_buf->data[4]) > 0)
libavcodec/libschroedingerenc.c+5−5
@@ -79,7 +79,7 @@ typedef struct SchroEncoderParams { · 78 unmodified lines
7979 /**
8080 * Works out Schro-compatible chroma format.
8181 */
82−static int SetSchroChromaFormat(AVCodecContext *avccontext)
82+static int set_chroma_format(AVCodecContext *avccontext)
8383 {
8484 int num_formats = sizeof(schro_pixel_format_map) /
8585 sizeof(schro_pixel_format_map[0]);
@@ -128,7 +128,7 @@ static int libschroedinger_encode_init(AVCodecContext *avccontext) · 42 unmodified lines
128128 p_schro_params->format->width = avccontext->width;
129129 p_schro_params->format->height = avccontext->height;
130130
131− if (SetSchroChromaFormat(avccontext) == -1)
131+ if (set_chroma_format(avccontext) == -1)
132132 return -1;
133133
134134 if (avccontext->color_primaries == AVCOL_PRI_BT709) {
@@ -258,7 +258,7 @@ static SchroFrame *libschroedinger_frame_from_data(AVCodecContext *avccontext, · 123 unmodified lines
258258 return in_frame;
259259 }
260260
261−static void SchroedingerFreeFrame(void *data)
261+static void libschroedinger_free_frame(void *data)
262262 {
263263 FFSchroEncodedFrame *enc_frame = data;
264264
@@ -411,7 +411,7 @@ static int libschroedinger_encode_frame(AVCodecContext *avccontext, AVPacket *pk · 146 unmodified lines
411411
412412 error:
413413 /* free frame */
414− SchroedingerFreeFrame(p_frame_output);
414+ libschroedinger_free_frame(p_frame_output);
415415 return ret;
416416 }
417417
@@ -425,7 +425,7 @@ static int libschroedinger_encode_close(AVCodecContext *avccontext) · 7 unmodified lines
425425
426426 /* Free data in the output frame queue. */
427427 ff_schro_queue_free(&p_schro_params->enc_frame_queue,
428− SchroedingerFreeFrame);
428+ libschroedinger_free_frame);
429429
430430
431431 /* Free the encoder buffer. */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t