# HG changeset patch
# User Diego 'Flameeyes' Pettenò <[EMAIL PROTECTED]>
# Date 1181318915 -7200
# Node ID c5895b357b5a3abc9b6f526cb8434a27da808e2c
# Parent 63b07f094b97a788065220b2077bc6b237e35b12
More conversion to switches.
diff -r c5895b357b5a3abc9b6f526cb8434a27da808e2c -r
63b07f094b97a788065220b2077bc6b237e35b12 src/demuxers/demux_qt.c
--- a/src/demuxers/demux_qt.c Fri Jun 08 18:08:35 2007 +0200
+++ b/src/demuxers/demux_qt.c Fri Jun 08 18:01:55 2007 +0200
@@ -817,9 +817,7 @@ static qt_error parse_trak_atom (qt_trak
unsigned char *trak_atom) {
int i, j, k;
- unsigned int trak_atom_size = BE_32(&trak_atom[0]);
- qt_atom current_atom;
- unsigned int current_atom_size;
+ const unsigned int trak_atom_size = BE_32(&trak_atom[0]);
unsigned int atom_pos;
unsigned int properties_offset;
unsigned int current_stsd_atom_size;
@@ -866,12 +864,13 @@ static qt_error parse_trak_atom (qt_trak
/* search for media type atoms */
for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) {
- current_atom = BE_32(&trak_atom[i]);
-
- if (current_atom == VMHD_ATOM) {
+ const qt_atom current_atom = BE_32(&trak_atom[i]);
+
+ switch (current_atom) {
+ case VMHD_ATOM:
trak->type = MEDIA_VIDEO;
break;
- } else if (current_atom == SMHD_ATOM) {
+ case SMHD_ATOM:
trak->type = MEDIA_AUDIO;
break;
}
@@ -883,8 +882,8 @@ static qt_error parse_trak_atom (qt_trak
/* search for the useful atoms */
for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) {
- current_atom_size = BE_32(&trak_atom[i - 4]);
- current_atom = BE_32(&trak_atom[i]);
+ const current_atom_size = BE_32(&trak_atom[i - 4]);
+ const current_atom = BE_32(&trak_atom[i]);
switch(current_atom) {
case TKHD_ATOM:
@@ -1920,7 +1919,6 @@ static void parse_moov_atom(qt_info *inf
int64_t bandwidth) {
int i, j;
unsigned int moov_atom_size = BE_32(&moov_atom[0]);
- qt_atom current_atom;
int string_size, error;
unsigned int max_video_frames = 0;
unsigned int max_audio_frames = 0;
@@ -1935,15 +1933,17 @@ static void parse_moov_atom(qt_info *inf
/* prowl through the moov atom looking for very specific targets */
for (i = ATOM_PREAMBLE_SIZE + 4; i < moov_atom_size - 4; i +=
BE_32(&moov_atom[i - 4])) {
- current_atom = BE_32(&moov_atom[i]);
-
- if (current_atom == MVHD_ATOM) {
+ const qt_atom current_atom = BE_32(&moov_atom[i]);
+
+ switch (current_atom) {
+ case MVHD_ATOM:
parse_mvhd_atom(info, &moov_atom[i - 4]);
if (info->last_error != QT_OK)
return;
- } else if (current_atom == TRAK_ATOM) {
-
+ break;
+
+ case TRAK_ATOM:
/* create a new trak structure */
info->trak_count++;
info->traks = (qt_trak *)realloc(info->traks,
@@ -1955,44 +1955,44 @@ static void parse_moov_atom(qt_info *inf
info->trak_count--;
return;
}
-
- } else if (current_atom == META_ATOM) {
-
+ break;
+
+ case META_ATOM:
parse_meta_atom(info, &moov_atom[i - 4]);
if (info->last_error != QT_OK)
return;
-
- } else if (current_atom == NAM_ATOM) {
-
+ break;
+
+ case NAM_ATOM:
string_size = BE_16(&moov_atom[i + 4]) + 1;
info->name = realloc (info->name, string_size);
strncpy(info->name, &moov_atom[i + 8], string_size - 1);
info->name[string_size - 1] = 0;
-
- } else if (current_atom == CPY_ATOM) {
-
+ break;
+
+ case CPY_ATOM:
string_size = BE_16(&moov_atom[i + 4]) + 1;
info->copyright = realloc (info->copyright, string_size);
strncpy(info->copyright, &moov_atom[i + 8], string_size - 1);
info->copyright[string_size - 1] = 0;
-
- } else if (current_atom == DES_ATOM) {
-
+ break;
+
+ case DES_ATOM:
string_size = BE_16(&moov_atom[i + 4]) + 1;
info->description = realloc (info->description, string_size);
strncpy(info->description, &moov_atom[i + 8], string_size - 1);
info->description[string_size - 1] = 0;
-
- } else if (current_atom == CMT_ATOM) {
-
+ break;
+
+ case CMT_ATOM:
string_size = BE_16(&moov_atom[i + 4]) + 1;
info->comment = realloc (info->comment, string_size);
strncpy(info->comment, &moov_atom[i + 8], string_size - 1);
info->comment[string_size - 1] = 0;
-
- } else if (current_atom == RMDA_ATOM ||
- current_atom == RMRA_ATOM) {
-
+ break;
+
+ case RMDA_ATOM:
+ case RMRA_ATOM:
/* create a new reference structure */
info->reference_count++;
info->references = (reference_t *)realloc(info->references,
@@ -2000,8 +2000,9 @@ static void parse_moov_atom(qt_info *inf
parse_reference_atom(&info->references[info->reference_count - 1],
&moov_atom[i - 4], info->base_mrl);
-
- } else {
+ break;
+
+ default:
debug_atom_load(" qt: unknown atom into the moov atom (0x%08X)\n",
current_atom);
}
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
