[Paraview] MJPEG instead of MPEG4 (issue 8925)

Michael Wild themiwi at gmail.com
Fri Aug 7 11:29:50 EDT 2009 

Pretty strange...

But the patch in itself should be self-explaining: just remove the  
VTKOGGTHEORA_ prefix from all VTKOGGTHEORA_USIZE16 variable names.

Michael

On 7. Aug, 2009, at 17:09, Dominik Szczerba wrote:

> This time I get during patching:
>
> ~/pack/paraview-cvs$ patch --dry-run -p1 < /home/domel/Downloads/ 
> 0004.patch
> patching file VTK/Utilities/vtkoggtheora/CMakeLists.txt
> Hunk #1 FAILED at 51.
> 1 out of 1 hunk FAILED -- saving rejects to file VTK/Utilities/ 
> vtkoggtheora/CMakeLists.txt.rej
>
>
>
> CMakeLists.txt.rej contains:
>
> *************** ELSE(HAVE_VTKOGGTHEORA_UINT32_T)
> *** 51,63 ****
>  ENDIF(HAVE_VTKOGGTHEORA_UINT32_T)
>
>  IF(HAVE_VTKOGGTHEORA_UINT16_T)
> -   SET(VTKOGGTHEORA_USIZE16 uint16_t)
>  ELSEIF(VTKOGGTHEORA_SHORT EQUAL 2)
>    SET(USIZE16 "unsigned short")
>  ELSEIF(VTKOGGTHEORA_INT EQUAL 2)
> -   SET(VTKOGGTHEORA_USIZE16 "unsigned int")
>  ELSEIF(LONG EQUAL 2)
> -   SET(VTKOGGTHEORA_USIZE16 "unsigned long")
>  ELSE(HAVE_VTKOGGTHEORA_UINT16_T)
>    MESSAGE(SEND_ERROR "No unsigned 16 bit type found")
>  ENDIF(HAVE_VTKOGGTHEORA_UINT16_T)
> --- 51,63 ----
>  ENDIF(HAVE_VTKOGGTHEORA_UINT32_T)
>
>  IF(HAVE_VTKOGGTHEORA_UINT16_T)
> +   SET(USIZE16 uint16_t)
>  ELSEIF(VTKOGGTHEORA_SHORT EQUAL 2)
>    SET(USIZE16 "unsigned short")
>  ELSEIF(VTKOGGTHEORA_INT EQUAL 2)
> +   SET(USIZE16 "unsigned int")
>  ELSEIF(LONG EQUAL 2)
> +   SET(USIZE16 "unsigned long")
>  ELSE(HAVE_VTKOGGTHEORA_UINT16_T)
>    MESSAGE(SEND_ERROR "No unsigned 16 bit type found")
>  ENDIF(HAVE_VTKOGGTHEORA_UINT16_T)
>
> What now?
> -- Dominik
>
> Michael Wild wrote:
>> Sorry, simple copy-paste error, fixed it manually in my build tree  
>> and  then forgot about it ;-)
>> Please try the following patch, if it works I will update the  
>> patches  on the bug-tracker.
>> diff --git a/VTK/Utilities/vtkoggtheora/CMakeLists.txt b/VTK/ 
>> Utilities/ vtkoggtheora/CMakeLists.txt
>> index 4b4a12d..a960a14 100644
>> --- a/VTK/Utilities/vtkoggtheora/CMakeLists.txt
>> +++ b/VTK/Utilities/vtkoggtheora/CMakeLists.txt
>> @@ -51,13 +51,13 @@ ELSE(HAVE_VTKOGGTHEORA_UINT32_T)
>> ENDIF(HAVE_VTKOGGTHEORA_UINT32_T)
>> IF(HAVE_VTKOGGTHEORA_UINT16_T)
>> -  SET(VTKOGGTHEORA_USIZE16 uint16_t)
>> +  SET(USIZE16 uint16_t)
>> ELSEIF(VTKOGGTHEORA_SHORT EQUAL 2)
>>   SET(USIZE16 "unsigned short")
>> ELSEIF(VTKOGGTHEORA_INT EQUAL 2)
>> -  SET(VTKOGGTHEORA_USIZE16 "unsigned int")
>> +  SET(USIZE16 "unsigned int")
>> ELSEIF(LONG EQUAL 2)
>> -  SET(VTKOGGTHEORA_USIZE16 "unsigned long")
>> +  SET(USIZE16 "unsigned long")
>> ELSE(HAVE_VTKOGGTHEORA_UINT16_T)
>>   MESSAGE(SEND_ERROR "No unsigned 16 bit type found")
>> ENDIF(HAVE_VTKOGGTHEORA_UINT16_T)
>> On 7. Aug, 2009, at 8:31, Dominik Szczerba wrote:
>>> Hi,
>>>
>>> I get an error during patching and compilating CVS from a few  
>>> days  back:
>>>
>>> [ 17%] Building CXX object VTK/IO/CMakeFiles/vtkIO.dir/  
>>> vtkOggTheoraWriter.cxx.o
>>> In file included from /home/domel/build/paraview-cvs/VTK/ 
>>> Utilities/ vtkoggtheora/include/ogg/os_types.h:139,
>>>               from /home/domel/build/paraview-cvs/VTK/Utilities/  
>>> vtkoggtheora/include/ogg/ogg.h:26,
>>>               from /home/domel/pack/paraview-cvs/VTK/Utilities/  
>>> vtk_oggtheora.h:25,
>>>               from /home/domel/pack/paraview-cvs/VTK/IO/  
>>> vtkOggTheoraWriter.cxx:22:
>>> /home/domel/build/paraview-cvs/VTK/Utilities/vtkoggtheora/include/  
>>> ogg/config_types.h:15: error: ISO C++ forbids declaration of   
>>> ‘ogg_uint16_t’ with no type
>>> make[2]: *** [VTK/IO/CMakeFiles/vtkIO.dir/ 
>>> vtkOggTheoraWriter.cxx.o]  Error 1
>>> make[1]: *** [VTK/IO/CMakeFiles/vtkIO.dir/all] Error 2
>>>
>>> -- Dominik
>>>
>>> Michael Wild wrote:
>>>> Hi hope it works with a current checkout... Otherwise you might  
>>>> try  to  apply the patches on a checkout with a date in mid-July.
>>>> Yes, all three patches are necessary:
>>>> 1. adds the vtkoggtheora library to VTK
>>>> 2. adds the vtkOggTheoraWriter class to VTK
>>>> 3. adds the whole machinery into ParaView
>>>> Michael
>>>> On 5. Aug, 2009, at 13:42, Dominik Szczerba wrote:
>>>>> I would be glad to try it on linux. I assume I need to apply  
>>>>> all  the  3 patches to the latest CVS checkout - correct?
>>>>>
>>>>> - Dominik
>>>>>
>>>>> Michael Wild wrote:
>>>>>> Now that the flurry around 3.6 has settled a bit and Berk is   
>>>>>> back,  I  would like to draw some attention to below message  
>>>>>> of  mine I  sent a  few weeks ago...
>>>>>> On 17. Jul, 2009, at 15:32, Michael Wild wrote:
>>>>>>> Hi all
>>>>>>>
>>>>>>> as promised, I worked on directly integrating Ogg/Theora  
>>>>>>> into    ParaView (well, mostly into the VTK distributed with  
>>>>>>> ParaView).  I   created issuehttp://public.kitware.com/Bug/view.php?id=9281 
>>>>>>>   with   patches attached to it. I tested it on Mac OS X  
>>>>>>> 10.5.7,  so if   somebody could give it a spin on Linux and  
>>>>>>> Windows and  give me  some  feedback, that would be great.
>>>>>>>
>>>>>>> Cheers
>>>>>>>
>>>>>>> Michael
>>>>>>>
>>>>>>> On 10. Jul, 2009, at 17:25, Berk Geveci wrote:
>>>>>>>
>>>>>>>> I agree that it would be nice to add ogg/theora. I am  
>>>>>>>> guessing   ffmpeg
>>>>>>>> supports it. Would you mind adding a feature request in
>>>>>>>> http://paraview.org/Bug.
>>>>>>>>
>>>>>>>> Thanks,
>>>>>>>> -berk
>>>>>>>>
>>>>>> _______________________________________________
>>>>>> Powered by www.kitware.com
>>>>>> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>>>>>> Please keep messages on-topic and check the ParaView Wiki at: http://paraview.org/Wiki/ParaView
>>>>>> Follow this link to subscribe/unsubscribe:
>>>>>> http://www.paraview.org/mailman/listinfo/paraview
>>>>> -- 
>>>>> d o m i n i k   s z c z e r b a ,   p h d . . . . . . . . . . .
>>>>> c o m p u t a t i o n a l   l i f e   s c i e n c e   g r o u p
>>>>> . . . . . . . i t ' i s   r e s e a r c h   f o u n d a t i o n
>>>>> . . . . . . . . . . . . . . . . . . . . http://www.itis.ethz.ch
>>>>>
>>>
>>> -- 
>>> d o m i n i k   s z c z e r b a ,   p h d . . . . . . . . . . .
>>> c o m p u t a t i o n a l   l i f e   s c i e n c e   g r o u p
>>> . . . . . . . i t ' i s   r e s e a r c h   f o u n d a t i o n
>>> . . . . . . . . . . . . . . . . . . . . http://www.itis.ethz.ch
>>>
>
>
> -- 
> d o m i n i k   s z c z e r b a ,   p h d . . . . . . . . . . .
> c o m p u t a t i o n a l   l i f e   s c i e n c e   g r o u p
> . . . . . . . i t ' i s   r e s e a r c h   f o u n d a t i o n
> . . . . . . . . . . . . . . . . . . . . http://www.itis.ethz.ch
>

More information about the ParaView mailing list