[vlc-devel] [PATCH] fourcc: refactor Lookup

[Zhao Zhili]

Thanks for your review, a new patch is attached.

>From b52f501f7c9ad4521cf571d2b1b6531a6f1fa6cc Mon Sep 17 00:00:00 2001
From: Zhao Zhili <wantlamy at gmail.com>
Date: Tue, 14 Jun 2016 00:51:52 +0800
Subject: [PATCH] fourcc: refactor Lookup

---
 src/misc/fourcc.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 51c36a1..f1341d7 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -45,24 +45,17 @@ static vlc_fourcc_t Lookup(vlc_fourcc_t fourcc, const
char **restrict dsc,
                            const struct fourcc_desc *dscv, size_t dscc)
 {
     const struct fourcc_mapping *mapping;
-    const struct fourcc_desc *desc;
+    const struct fourcc_desc *desc = NULL;

     mapping = bsearch(&fourcc, mapv, mapc, sizeof (*mapv), fourcc_cmp);
     if (mapping != NULL)
     {
-        if (dsc != NULL)
-        {
-            desc = bsearch(&fourcc, dscv, dscc, sizeof (*dscv),
fourcc_cmp);
-            if (desc != NULL)
-            {
-                *dsc = desc->desc;
-                return mapping->fourcc;
-            }
-        }
+        desc = bsearch(&fourcc, dscv, dscc, sizeof (*dscv), fourcc_cmp);
         fourcc = mapping->fourcc;
     }

-    desc = bsearch(&fourcc, dscv, dscc, sizeof (*dscv), fourcc_cmp);
+    if (desc == NULL)
+        desc = bsearch(&fourcc, dscv, dscc, sizeof (*dscv), fourcc_cmp);
     if (desc == NULL)
         return 0; /* Unknown FourCC */
     if (dsc != NULL)
-- 
2.7.4


On Mon, Jun 13, 2016 at 8:18 PM, Rémi Denis-Courmont <remi at remlab.net>
wrote:

> Le 2016-06-13 12:12, Zhao Zhili a écrit :
>
>> ---
>>  src/misc/fourcc.c | 11 -----------
>>  1 file changed, 11 deletions(-)
>>
>> diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
>> index 51c36a1..d69c49b 100644
>> --- a/src/misc/fourcc.c
>> +++ b/src/misc/fourcc.c
>> @@ -49,18 +49,7 @@ static vlc_fourcc_t Lookup(vlc_fourcc_t fourcc,
>> const char **restrict dsc,
>>
>>      mapping = bsearch(&fourcc, mapv, mapc, sizeof (*mapv),
>> fourcc_cmp);
>>      if (mapping != NULL)
>> -    {
>> -        if (dsc != NULL)
>> -        {
>> -            desc = bsearch(&fourcc, dscv, dscc, sizeof
>> (*dscv), fourcc_cmp);
>> -            if (desc != NULL)
>> -            {
>> -                *dsc = desc->desc;
>> -                return mapping->fourcc;
>> -            }
>> -        }
>>          fourcc = mapping->fourcc;
>> -    }
>>
>>      desc = bsearch(&fourcc, dscv, dscc, sizeof (*dscv),
>> fourcc_cmp);
>>      if (desc == NULL)
>>
>
> Doesn't this break E() fourCC entries?
>
> --
> Rémi Denis-Courmont
> http://www.remlab.net/
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20160614/9c52f2a5/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-fourcc-refactor-Lookup.patch
Type: text/x-patch
Size: 1461 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20160614/9c52f2a5/attachment.bin>