From: Gustavo Sverzut Barbieri Date: Tue, 10 Sep 2013 17:51:56 +0000 (-0300) Subject: mp4: remove support for deprecated library. X-Git-Tag: accepted/tizen/generic/20140106.140339~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f05e0689a8af1bbadd69b61996aa7570475022f;p=platform%2Fupstream%2Flightmediascanner.git mp4: remove support for deprecated library. the new 2.0 api is already old enough, remove support for the previous deprecated. --- diff --git a/configure.ac b/configure.ac index 7cf8b40..a5d5047 100644 --- a/configure.ac +++ b/configure.ac @@ -65,32 +65,25 @@ define([CHECK_MODULE_OGG], AM_CONDITIONAL(HAVE_MP4V2, false) define([CHECK_MODULE_MP4], [ - AC_CHECK_HEADERS(mp4.h, HAVE_MP4_HEADERS=yes, HAVE_MP4_HEADERS=no) AC_CHECK_HEADERS(mp4v2/mp4v2.h, HAVE_MP4V2_HEADERS=yes, HAVE_MP4V2_HEADERS=no) - if test "x$HAVE_MP4_HEADERS" = "xyes" -o "x$HAVE_MP4V2_HEADERS" = "xyes"; then + if test "x$HAVE_MP4V2_HEADERS" = "xyes"; then AC_CHECK_LIB(mp4v2, MP4Read, [MP4=true], [MP4=false]) MP4V2_LIBS="-lmp4v2" AC_SUBST(MP4V2_LIBS) - if test "x$HAVE_MP4V2_HEADERS" = "xyes"; then - AC_DEFINE(HAVE_MP4V2, 1, Define if mp4v2.h is present) - fi - if test "x$HAVE_MP4_HEADERS" = "xyes"; then - AC_DEFINE(HAVE_MP4, 1, Define if mp4.h is present) - fi - - # test for new 2.0 api - if test "x$HAVE_MP4V2_HEADERS" = "xyes"; then - AC_MSG_CHECKING([mp4v2 2.0 API (MP4Read and MP4Close)]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include ]], - [[MP4FileHandle fh = MP4Read("/tmp"); - MP4Close(fh, 0); - ]])], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_MP4V2_2_0_API, 1, Define to 1 if you have mp4v2 2.0 api) - ], [AC_MSG_RESULT([no])]) - fi + + # strict about new 2.0 api + AC_MSG_CHECKING([mp4v2 2.0 API (MP4Read and MP4Close)]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#include ]], + [[MP4FileHandle fh = MP4Read("/tmp"); + MP4Close(fh, 0); + ]])], + [ + MP4=true + AC_MSG_RESULT([yes]) + ], [ + MP4=false + AC_MSG_RESULT([no])]) else MP4=false fi diff --git a/src/plugins/mp4/mp4.c b/src/plugins/mp4/mp4.c index 1188397..687e1e5 100644 --- a/src/plugins/mp4/mp4.c +++ b/src/plugins/mp4/mp4.c @@ -30,11 +30,7 @@ static const char PV[] = PACKAGE_VERSION; /* mp4.h screws PACKAGE_VERSION */ #include #include -#ifdef HAVE_MP4V2 #include -#else -#include -#endif #include #include @@ -172,7 +168,6 @@ _match(struct plugin *p, const char *path, int len, int base) return (void*)(i + 1); } -#ifdef HAVE_MP4V2_2_0_API static struct lms_string_size _get_audio_codec(MP4FileHandle mp4_fh, MP4TrackId id) { @@ -344,102 +339,6 @@ fail: return r; } -#else -static int -_parse(struct plugin *plugin, struct lms_context *ctxt, const struct lms_file_info *finfo, void *match) -{ - struct mp4_info info = { }; - struct lms_audio_info audio_info = { }; - struct lms_video_info video_info = { }; - int r, stream_type = LMS_STREAM_TYPE_AUDIO; - MP4FileHandle mp4_fh; - u_int32_t num_tracks; - - mp4_fh = MP4Read(finfo->path, 0); - if (mp4_fh == MP4_INVALID_FILE_HANDLE) { - fprintf(stderr, "ERROR: cannot read mp4 file %s\n", finfo->path); - return -1; - } - - /* check if the file contains a video track */ - num_tracks = MP4GetNumberOfTracks(mp4_fh, MP4_VIDEO_TRACK_TYPE, 0); - if (num_tracks > 0) - stream_type = LMS_STREAM_TYPE_VIDEO; - - MP4GetMetadataName(mp4_fh, &info.title.str); - if (info.title.str) - info.title.len = strlen(info.title.str); - MP4GetMetadataArtist(mp4_fh, &info.artist.str); - if (info.artist.str) - info.artist.len = strlen(info.artist.str); - - if (stream_type == LMS_STREAM_TYPE_AUDIO) { - u_int16_t total_tracks; - - MP4GetMetadataAlbum(mp4_fh, &info.album.str); - if (info.album.str) - info.album.len = strlen(info.album.str); - MP4GetMetadataGenre(mp4_fh, &info.genre.str); - if (info.genre.str) - info.genre.len = strlen(info.genre.str); - - MP4GetMetadataTrack(mp4_fh, &info.trackno, &total_tracks); - } - - lms_string_size_strip_and_free(&info.title); - lms_string_size_strip_and_free(&info.artist); - lms_string_size_strip_and_free(&info.album); - lms_string_size_strip_and_free(&info.genre); - - if (!info.title.str) - info.title = str_extract_name_from_path(finfo->path, finfo->path_len, - finfo->base, - &_exts[((long) match) - 1], - NULL); - if (info.title.str) - lms_charset_conv(ctxt->cs_conv, &info.title.str, &info.title.len); - - if (info.artist.str) - lms_charset_conv(ctxt->cs_conv, &info.artist.str, &info.artist.len); - if (info.album.str) - lms_charset_conv(ctxt->cs_conv, &info.album.str, &info.album.len); - if (info.genre.str) - lms_charset_conv(ctxt->cs_conv, &info.genre.str, &info.genre.len); - -#if 0 - fprintf(stderr, "file %s info\n", finfo->path); - fprintf(stderr, "\ttitle='%s'\n", info.title.str); - fprintf(stderr, "\tartist='%s'\n", info.artist.str); - fprintf(stderr, "\talbum='%s'\n", info.album.str); - fprintf(stderr, "\tgenre='%s'\n", info.genre.str); -#endif - - if (stream_type == LMS_STREAM_TYPE_AUDIO) { - audio_info.id = finfo->id; - audio_info.title = info.title; - audio_info.artist = info.artist; - audio_info.album = info.album; - audio_info.genre = info.genre; - audio_info.trackno = info.trackno; - r = lms_db_audio_add(plugin->audio_db, &audio_info); - } - else { - video_info.id = finfo->id; - video_info.title = info.title; - video_info.artist = info.artist; - r = lms_db_video_add(plugin->video_db, &video_info); - } - - MP4Close(mp4_fh); - - free(info.title.str); - free(info.artist.str); - free(info.album.str); - free(info.genre.str); - - return r; -} -#endif static int _setup(struct plugin *plugin, struct lms_context *ctxt)