Mercurial > libavformat.hg

comparison matroskadec.c @ 3477:8adaa9258dba libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
matroskadec: remove some useless code
author aurel
date Mon, 16 Jun 2008 23:11:02 +0000
parents 3f87bde8a97c
children b77ced770a93
comparison
equal deleted inserted replaced
3476:3026020083e8 3477:8adaa9258dba
53 53
54 char *name; 54 char *name;
55 char language[4]; 55 char language[4];
56 56
57 char *codec_id; 57 char *codec_id;
58 char *codec_name;
59 58
60 unsigned char *codec_priv; 59 unsigned char *codec_priv;
61 int codec_priv_size; 60 int codec_priv_size;
62 61
63 double time_scale; 62 double time_scale;
77 int pixel_height; 76 int pixel_height;
78 int display_width; 77 int display_width;
79 int display_height; 78 int display_height;
80 79
81 uint32_t fourcc; 80 uint32_t fourcc;
82
83 MatroskaAspectRatioMode ar_mode;
84 MatroskaEyeMode eye_mode;
85 81
86 //.. 82 //..
87 } MatroskaVideoTrack; 83 } MatroskaVideoTrack;
88 84
89 typedef struct MatroskaAudioTrack { 85 typedef struct MatroskaAudioTrack {
1151 track->flags &= 1147 track->flags &=
1152 ~MATROSKA_VIDEOTRACK_INTERLACED; 1148 ~MATROSKA_VIDEOTRACK_INTERLACED;
1153 break; 1149 break;
1154 } 1150 }
1155 1151
1156 /* stereo mode (whether the video has two streams,
1157 * where one is for the left eye and the other for
1158 * the right eye, which creates a 3D-like
1159 * effect) */
1160 case MATROSKA_ID_VIDEOSTEREOMODE: {
1161 uint64_t num;
1162 if ((res = ebml_read_uint(matroska, &id,
1163 &num)) < 0)
1164 break;
1165 if (num != MATROSKA_EYE_MODE_MONO &&
1166 num != MATROSKA_EYE_MODE_LEFT &&
1167 num != MATROSKA_EYE_MODE_RIGHT &&
1168 num != MATROSKA_EYE_MODE_BOTH) {
1169 av_log(matroska->ctx, AV_LOG_INFO,
1170 "Ignoring unknown eye mode 0x%x\n",
1171 (uint32_t) num);
1172 break;
1173 }
1174 videotrack->eye_mode = num;
1175 break;
1176 }
1177
1178 /* aspect ratio behaviour */
1179 case MATROSKA_ID_VIDEOASPECTRATIO: {
1180 uint64_t num;
1181 if ((res = ebml_read_uint(matroska, &id,
1182 &num)) < 0)
1183 break;
1184 if (num != MATROSKA_ASPECT_RATIO_MODE_FREE &&
1185 num != MATROSKA_ASPECT_RATIO_MODE_KEEP &&
1186 num != MATROSKA_ASPECT_RATIO_MODE_FIXED) {
1187 av_log(matroska->ctx, AV_LOG_INFO,
1188 "Ignoring unknown aspect ratio 0x%x\n",
1189 (uint32_t) num);
1190 break;
1191 }
1192 videotrack->ar_mode = num;
1193 break;
1194 }
1195
1196 /* colorspace (only matters for raw video) 1152 /* colorspace (only matters for raw video)
1197 * fourcc */ 1153 * fourcc */
1198 case MATROSKA_ID_VIDEOCOLORSPACE: { 1154 case MATROSKA_ID_VIDEOCOLORSPACE: {
1199 uint64_t num; 1155 uint64_t num;
1200 if ((res = ebml_read_uint(matroska, &id, 1156 if ((res = ebml_read_uint(matroska, &id,
1208 av_log(matroska->ctx, AV_LOG_INFO, 1164 av_log(matroska->ctx, AV_LOG_INFO,
1209 "Unknown video track header entry " 1165 "Unknown video track header entry "
1210 "0x%x - ignoring\n", id); 1166 "0x%x - ignoring\n", id);
1211 /* pass-through */ 1167 /* pass-through */
1212 1168
1169 case MATROSKA_ID_VIDEOSTEREOMODE:
1170 case MATROSKA_ID_VIDEOASPECTRATIO:
1213 case EBML_ID_VOID: 1171 case EBML_ID_VOID:
1214 res = ebml_read_skip(matroska); 1172 res = ebml_read_skip(matroska);
1215 break; 1173 break;
1216 } 1174 }
1217 1175
1323 int size; 1281 int size;
1324 if ((res = ebml_read_binary(matroska, &id, &data, &size) < 0)) 1282 if ((res = ebml_read_binary(matroska, &id, &data, &size) < 0))
1325 break; 1283 break;
1326 track->codec_priv = data; 1284 track->codec_priv = data;
1327 track->codec_priv_size = size; 1285 track->codec_priv_size = size;
1328 break;
1329 }
1330
1331 /* name of the codec */
1332 case MATROSKA_ID_CODECNAME: {
1333 char *text;
1334 if ((res = ebml_read_utf8(matroska, &id, &text)) < 0)
1335 break;
1336 track->codec_name = text;
1337 break; 1286 break;
1338 } 1287 }
1339 1288
1340 /* name of this track */ 1289 /* name of this track */
1341 case MATROSKA_ID_TRACKNAME: { 1290 case MATROSKA_ID_TRACKNAME: {
1567 /* pass-through */ 1516 /* pass-through */
1568 1517
1569 case EBML_ID_VOID: 1518 case EBML_ID_VOID:
1570 /* we ignore these because they're nothing useful. */ 1519 /* we ignore these because they're nothing useful. */
1571 case MATROSKA_ID_TRACKFLAGFORCED: 1520 case MATROSKA_ID_TRACKFLAGFORCED:
1521 case MATROSKA_ID_CODECNAME:
1572 case MATROSKA_ID_CODECDECODEALL: 1522 case MATROSKA_ID_CODECDECODEALL:
1573 case MATROSKA_ID_CODECINFOURL: 1523 case MATROSKA_ID_CODECINFOURL:
1574 case MATROSKA_ID_CODECDOWNLOADURL: 1524 case MATROSKA_ID_CODECDOWNLOADURL:
1575 case MATROSKA_ID_TRACKMINCACHE: 1525 case MATROSKA_ID_TRACKMINCACHE:
1576 case MATROSKA_ID_TRACKMAXCACHE: 1526 case MATROSKA_ID_TRACKMAXCACHE:
3192 matroska_clear_queue(matroska); 3142 matroska_clear_queue(matroska);
3193 3143
3194 for (n = 0; n < matroska->num_tracks; n++) { 3144 for (n = 0; n < matroska->num_tracks; n++) {
3195 MatroskaTrack *track = matroska->tracks[n]; 3145 MatroskaTrack *track = matroska->tracks[n];
3196 av_free(track->codec_id); 3146 av_free(track->codec_id);
3197 av_free(track->codec_name);
3198 av_free(track->codec_priv); 3147 av_free(track->codec_priv);
3199 av_free(track->name); 3148 av_free(track->name);
3200 3149
3201 if (track->type == MATROSKA_TRACK_TYPE_AUDIO) { 3150 if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
3202 MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *)track; 3151 MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *)track;