third-party-mirrors/spek
1
0
Fork 0
mirror of https://github.com/alexkay/spek.git synced 2025-06-08 19:32:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

FFmpeg can now handle UTF-8 encoded file names

Browse Source
This commit is contained in:
Alexander Kojevnikov 2012-08-27 21:02:56 -07:00
parent a687900e18
commit 57839f49f9
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/spek-audio.c
View File

@ -28,8 +28,6 @@
struct spek_audio_context struct spek_audio_context
{ {
char *file_name; // TODO: needed?
char *short_name;
AVFormatContext *format_context; AVFormatContext *format_context;
int audio_stream; int audio_stream;
AVCodecContext *codec_context; AVCodecContext *codec_context;
@ -58,19 +56,10 @@ struct spek_audio_context * spek_audio_open(const char *path)
{ {
// TODO: malloc and initialise explicitely // TODO: malloc and initialise explicitely
struct spek_audio_context *cx = calloc(1, sizeof(struct spek_audio_context)); struct spek_audio_context *cx = calloc(1, sizeof(struct spek_audio_context));
cx->file_name = strdup(path);
// av_open_input_file() cannot open files with Unicode chars in it
// when running under Windows. When this happens we will re-try
// using the corresponding short file name.
// TODO: test if it's already fixed in FFmpeg
cx->short_name = spek_platform_short_path(path);
if (avformat_open_input(&cx->format_context, path, NULL, NULL) != 0) { if (avformat_open_input(&cx->format_context, path, NULL, NULL) != 0) {
if (!cx->short_name || cx->properties.error = SPEK_AUDIO_CANNOT_OPEN_FILE;
avformat_open_input(&cx->format_context, cx->short_name, NULL, NULL) != 0 ) { return cx;
cx->properties.error = SPEK_AUDIO_CANNOT_OPEN_FILE;
return cx;
}
} }
if (avformat_find_stream_info(cx->format_context, NULL) < 0) { if (avformat_find_stream_info(cx->format_context, NULL) < 0) {
// 24-bit APE returns an error but parses the stream info just fine. // 24-bit APE returns an error but parses the stream info just fine.
@ -211,12 +200,6 @@ int spek_audio_read(struct spek_audio_context *cx) {
void spek_audio_close (struct spek_audio_context *cx) void spek_audio_close (struct spek_audio_context *cx)
{ {
if (cx->file_name != NULL) {
free(cx->file_name);
}
if (cx->short_name != NULL) {
free(cx->short_name);
}
if (cx->properties.codec_name != NULL) { if (cx->properties.codec_name != NULL) {
free(cx->properties.codec_name); free(cx->properties.codec_name);
} }