mirror
/
F5OEO-tstools
kopia lustrzana https://github.com/F5OEO/tstools
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Output of esreport for the nal units has been modified. Now it says if the nal_slice_types means that all the slices are of that type or only the first one. 

Also the non-reference nal_ref_idc is explicit.

--HG--
extra : convert_revision : svn%3Aeff31bef-be4a-0410-a8fe-e47997df2690/trunk%405
issue20
loreg 2008-04-29 12:26:17 +00:00
rodzic 001f5d39d6
commit c6ebcc4fe1
2 zmienionych plików z 14 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
esreport.c
Wyświetl plik

@ -686,28 +686,28 @@ static void report_by_nal_unit(ES_p es,
printf("nal_ref_idc:\n");
for (ii=0; ii<4; ii++)
if (ref_idcs[ii] > 0)
printf(" %8d of %2d\n",ref_idcs[ii],ii);
printf(" %8d of %2d%s\n",ref_idcs[ii],ii,ii?"":" (non-reference)");
printf("nal_unit_type:\n");
for (ii=0; ii<13; ii++)
if (unit_types[ii] > 0)
printf(" %8d of %2d (%s)\n",unit_types[ii],ii,NAL_UNIT_TYPE_STR(ii));
printf(" %8d of type %2d (%s)\n",unit_types[ii],ii,NAL_UNIT_TYPE_STR(ii));
if (unit_types[13] > 0)
printf(" %8d of 13..23 (Reserved)\n",unit_types[13]);
printf(" %8d of type 13..23 (Reserved)\n",unit_types[13]);
if (unit_types[14] > 0)
printf(" %8d of 24..31 (Unspecified)\n",unit_types[14]);
printf(" %8d of typ 24..31 (Unspecified)\n",unit_types[14]);
printf("slice_type:\n");
for (ii=0; ii<10; ii++)
if (slice_types[ii] > 0)
printf(" %8d of %2d (%s)\n",slice_types[ii],ii,
printf(" %8d of type %2d (%s)\n",slice_types[ii],ii,
NAL_SLICE_TYPE_STR(ii));
}
else
fprintf(stderr,"### Abandoning reporting due to error\n");
free_nal_unit_context(&context);
}
/*
* Report on the content of an MPEG2 file
*
@ -1031,7 +1031,7 @@ static void print_usage()
" -avs Force the program to treat the input as AVS.\n"
);
}
int main(int argc, char **argv)
{
char *input_name = NULL;
@ -1236,3 +1236,4 @@ int main(int argc, char **argv)
}
return 0;
}

12
nalunit_defns.h
Wyświetl plik

@ -80,12 +80,12 @@ enum NAL_UNIT_TYPE
#define ALL_SLICES_SP 8
#define ALL_SLICES_SI 9
#define NAL_SLICE_TYPE_STR(a) \
((a)==SLICE_P?"P": (a)==SLICE_B?"B": (a)==SLICE_I?"I": \
(a)==SLICE_SP?"SP": (a)==SLICE_SI?"SI": \
(a)==ALL_SLICES_P?"P &c": (a)==ALL_SLICES_B?"B &c": \
(a)==ALL_SLICES_I?"I &c": (a)==ALL_SLICES_SP?"SP &c": \
(a)==ALL_SLICES_SI?"SI &c":"??")
#define NAL_SLICE_TYPE_STR(a) \
((a)==SLICE_P?"First P": (a)==SLICE_B?"First B": (a)==SLICE_I?"First I": \
(a)==SLICE_SP?"First SP": (a)==SLICE_SI?"First SI": \
(a)==ALL_SLICES_P?"All P": (a)==ALL_SLICES_B?"All B": \
(a)==ALL_SLICES_I?"All I": (a)==ALL_SLICES_SP?"All SP": \
(a)==ALL_SLICES_SI?"All SI":"??")
// ------------------------------------------------------------