am e18d4d01: Merge change 22938 into eclair
Merge commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851' into eclair-plus-aosp * commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851': Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
This commit is contained in:
@@ -41,6 +41,7 @@ using namespace android;
|
|||||||
|
|
||||||
static long gNumRepetitions;
|
static long gNumRepetitions;
|
||||||
static long gMaxNumFrames; // 0 means decode all available.
|
static long gMaxNumFrames; // 0 means decode all available.
|
||||||
|
static long gReproduceBug; // if not -1.
|
||||||
|
|
||||||
static int64_t getNowUs() {
|
static int64_t getNowUs() {
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
@@ -100,6 +101,11 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) {
|
|||||||
if (gMaxNumFrames > 0 && numFrames == gMaxNumFrames) {
|
if (gMaxNumFrames > 0 && numFrames == gMaxNumFrames) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (gReproduceBug == 1 && numFrames == 40) {
|
||||||
|
printf("seeking past the end now.");
|
||||||
|
options.setSeekTo(LONG_MAX);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("$");
|
printf("$");
|
||||||
@@ -124,6 +130,7 @@ static void usage(const char *me) {
|
|||||||
fprintf(stderr, " -n repetitions\n");
|
fprintf(stderr, " -n repetitions\n");
|
||||||
fprintf(stderr, " -l(ist) components\n");
|
fprintf(stderr, " -l(ist) components\n");
|
||||||
fprintf(stderr, " -m max-number-of-frames-to-decode in each pass\n");
|
fprintf(stderr, " -m max-number-of-frames-to-decode in each pass\n");
|
||||||
|
fprintf(stderr, " -b bug to reproduce\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
@@ -133,9 +140,10 @@ int main(int argc, char **argv) {
|
|||||||
bool listComponents = false;
|
bool listComponents = false;
|
||||||
gNumRepetitions = 1;
|
gNumRepetitions = 1;
|
||||||
gMaxNumFrames = 0;
|
gMaxNumFrames = 0;
|
||||||
|
gReproduceBug = -1;
|
||||||
|
|
||||||
int res;
|
int res;
|
||||||
while ((res = getopt(argc, argv, "han:lm:")) >= 0) {
|
while ((res = getopt(argc, argv, "han:lm:b:")) >= 0) {
|
||||||
switch (res) {
|
switch (res) {
|
||||||
case 'a':
|
case 'a':
|
||||||
{
|
{
|
||||||
@@ -151,6 +159,7 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
case 'm':
|
case 'm':
|
||||||
case 'n':
|
case 'n':
|
||||||
|
case 'b':
|
||||||
{
|
{
|
||||||
char *end;
|
char *end;
|
||||||
long x = strtol(optarg, &end, 10);
|
long x = strtol(optarg, &end, 10);
|
||||||
@@ -161,8 +170,11 @@ int main(int argc, char **argv) {
|
|||||||
|
|
||||||
if (res == 'n') {
|
if (res == 'n') {
|
||||||
gNumRepetitions = x;
|
gNumRepetitions = x;
|
||||||
} else {
|
} else if (res == 'm') {
|
||||||
gMaxNumFrames = x;
|
gMaxNumFrames = x;
|
||||||
|
} else {
|
||||||
|
CHECK_EQ(res, 'b');
|
||||||
|
gReproduceBug = x;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user