RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-03 04:37:54 +00:00
Code Issues Releases Wiki Activity

demuxer.c: add demux_info_add_bstr(), use talloc for info field

Browse Source 
demux_info_add() is now a wrapper around demux_info_add_bstr().
This commit is contained in:
Anton Khirnov 2010-05-19 12:32:32 +02:00 committed by Uoti Urpala
parent d72541b75c
commit 9f508dab97
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libmpdemux/demuxer.c
View File

@ -383,11 +383,6 @@ void free_demuxer(demuxer_t *demuxer)
free_demuxer_stream(demuxer->video); free_demuxer_stream(demuxer->video);
free_demuxer_stream(demuxer->sub); free_demuxer_stream(demuxer->sub);
skip_streamfree: skip_streamfree:
if (demuxer->info) {
for (i = 0; demuxer->info[i] != NULL; i++)
free(demuxer->info[i]);
free(demuxer->info);
}
free(demuxer->filename); free(demuxer->filename);
if (demuxer->teletext) if (demuxer->teletext)
teletext_control(demuxer->teletext, TV_VBI_CONTROL_STOP, NULL); teletext_control(demuxer->teletext, TV_VBI_CONTROL_STOP, NULL);
@ -1270,28 +1265,34 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay,
} }
int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param) int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param)
{
return demux_info_add_bstr(demuxer, BSTR(opt), BSTR(param));
}
int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param)
{ {
char **info = demuxer->info; char **info = demuxer->info;
int n = 0; int n = 0;
for (n = 0; info && info[2 * n] != NULL; n++) { for (n = 0; info && info[2 * n] != NULL; n++) {
if (!strcasecmp(opt, info[2 * n])) { if (!bstrcasecmp(opt, BSTR(info[2*n]))) {
if (!strcmp(param, info[2 * n + 1])) { if (!bstrcmp(param, BSTR(info[2*n + 1]))) {
mp_msg(MSGT_DEMUX, MSGL_V, "Demuxer info %s set to unchanged value %s\n", opt, param); mp_msg(MSGT_DEMUX, MSGL_V, "Demuxer info %.*s set to unchanged value %.*s\n",
BSTR_P(opt), BSTR_P(param));
return 0; return 0;
} }
mp_tmsg(MSGT_DEMUX, MSGL_INFO, "Demuxer info %s changed to %s\n", opt, mp_tmsg(MSGT_DEMUX, MSGL_INFO, "Demuxer info %.*s changed to %.*s\n",
param); BSTR_P(opt), BSTR_P(param));
free(info[2 * n + 1]); talloc_free(info[2*n + 1]);
info[2 * n + 1] = strdup(param); info[2*n + 1] = talloc_strndup(demuxer->info, param.start, param.len);
return 0; return 0;
} }
} }
info = demuxer->info = realloc(info, (2 * (n + 2)) * sizeof(char *)); info = demuxer->info = talloc_realloc(demuxer, info, char *, 2 * (n + 2));
info[2 * n] = strdup(opt); info[2*n] = talloc_strndup(demuxer->info, opt.start, opt.len);
info[2 * n + 1] = strdup(param); info[2*n + 1] = talloc_strndup(demuxer->info, param.start, param.len);
memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *)); memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *));
return 1; return 1;

2
libmpdemux/demuxer.h
View File

@ -26,6 +26,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "stream/stream.h" #include "stream/stream.h"
#include "bstr.h"
struct MPOpts; struct MPOpts;
@ -428,6 +429,7 @@ extern int pts_from_bps;
extern int extension_parsing; extern int extension_parsing;
int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param); int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param);
int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param);
char* demux_info_get(demuxer_t *demuxer, const char *opt); char* demux_info_get(demuxer_t *demuxer, const char *opt);
int demux_info_print(demuxer_t *demuxer); int demux_info_print(demuxer_t *demuxer);
int demux_control(demuxer_t *demuxer, int cmd, void *arg); int demux_control(demuxer_t *demuxer, int cmd, void *arg);