Merge remote-tracking branch 'origin/update-video-template' into AMMR…

…-TutorialUpdates
AnyBody · Feb 26, 2025 · fe84bf2 · fe84bf2
2 parents 6569dac + 0adb326
commit fe84bf2
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 90 deletions.
diff --git a/Application/Examples/ArmCurl/Model/CreateVideo.any b/Application/Examples/ArmCurl/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = Main.Model.EnvironmentModel.Bench.Origin;
 

diff --git a/Application/Examples/BenchPress/Model/CreateVideo.any b/Application/Examples/BenchPress/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = Main.Model.EnvironmentModel.GlobalRef.Origin;
 

diff --git a/Application/Examples/BikeModel/Model/CreateVideo.any b/Application/Examples/BikeModel/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = {0.2,-0.3,0};
 

diff --git a/Application/Examples/KneeSimulator/Model/CreateVideo.any b/Application/Examples/KneeSimulator/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = {0.1, 0.45, 0};
 

diff --git a/Application/Examples/PushUp/Model/CreateVideo.any b/Application/Examples/PushUp/Model/CreateVideo.any
@@ -25,11 +25,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = {0.9,0.2,0};
 

diff --git a/Application/Examples/SeatedHuman/Model/CreateVideo.any b/Application/Examples/SeatedHuman/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = {0.2,-0.6,0};
 

diff --git a/Application/Examples/Squat/Model/CreateVideo.any b/Application/Examples/Squat/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = {0,0.75,0};
 

diff --git a/Application/Examples/StandingModel/Model/CreateVideo.any b/Application/Examples/StandingModel/Model/CreateVideo.any
@@ -26,11 +26,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsLumbar.PelvisSeg.r+{0,-0.2,0};
 

diff --git a/Application/Examples/WheelChairRancho/Model/CreateVideo.any b/Application/Examples/WheelChairRancho/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = z, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = Main.Model.EnvironmentModel.GlobalRef.Seat.r+{0,0,0.25};
 

diff --git a/Application/Examples/WheelTurn/Model/CreateVideo.any b/Application/Examples/WheelTurn/Model/CreateVideo.any
@@ -24,11 +24,6 @@ VideoLookAtCamera VideoTool (UP_DIRECTION = y, _DEBUG=0) =
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // The point the camera focuses on  
      CameraLookAtPoint = {0.1,0,0};
 

diff --git a/Application/MocapExamples/Plug-in-gait_MultiTrial_StandingRef/CreateVideo.any b/Application/MocapExamples/Plug-in-gait_MultiTrial_StandingRef/CreateVideo.any
@@ -21,11 +21,6 @@ VIDEO_STUDY = {
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
 
      // The point the camera focus on COM 
      CameraLookAtPoint = {0.5, 0.75, 1} ;

diff --git a/Application/MocapExamples/Plug-in-gait_Simple/Setup/CreateVideo.any b/Application/MocapExamples/Plug-in-gait_Simple/Setup/CreateVideo.any
@@ -21,11 +21,6 @@ VIDEO_STUDY = {
      // is created. This gives much better videos. Especially with lower resolutions
      VideoInputScale = 2; 
 
-     // Video codec used in FFMPEG video creation.
-     // The inlcuded FFMPEG only support free codecs (LGPL). You can replace the FFPEG
-     // executable in AnyBody's install directory to enable other codecs like "libx264"
-     VideoCodec = "libvpx-vp9";
-
      // This fixes the "Look at point" at a specific height while still following the center of mass
      CameraLookAtPoint = 0.75*CameraUpDirection +
          mult(Main.HumanModel.BodyModel.Interface.CenterOfMass.Pos, not(CameraUpDirection));

diff --git a/Docs/FullHuman_media.any b/Docs/FullHuman_media.any
@@ -40,7 +40,7 @@ Main = {
 //  };   
 
 
-  VideoLookAtCamera RotatingGif(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera RotatingGif(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "_static/Human_rotating_model";
 
@@ -49,7 +49,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {350,350};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsLumbar.PelvisSeg.r - {0,0.1,0};

diff --git a/Docs/body/_static/CervicalSpine_media.any b/Docs/body/_static/CervicalSpine_media.any
@@ -32,7 +32,7 @@ Main = {
   };
 
 
-  VideoLookAtCamera RotatingGif(UP_DIRECTION=y, _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera RotatingGif(UP_DIRECTION=y, _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "CervicalSpine_rotating_model";
 
@@ -41,7 +41,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {350,350};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsCervicalSpine.C1Seg.C2C1JntNode.r;

diff --git a/Docs/body/_static/DetailedHand_media.any b/Docs/body/_static/DetailedHand_media.any
@@ -32,7 +32,7 @@ Main = {
   };   
 
 
-  VideoLookAtCamera Video(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera Video(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "DetailedHand_ThumbsUp";
 
@@ -41,7 +41,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {500,350};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = {0.541, 1.27, 0.205};

diff --git a/Docs/body/_static/Leg_media.any b/Docs/body/_static/Leg_media.any
@@ -32,7 +32,7 @@ Main = {
   };   
 
 
-  VideoLookAtCamera RotatingVideo(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera RotatingVideo(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "Leg_rotating_model";
 
@@ -41,7 +41,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {350,350};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsLumbar.PelvisSeg.r+{0, -0.50, 0};

diff --git a/Docs/body/_static/LumbarSpine_media.any b/Docs/body/_static/LumbarSpine_media.any
@@ -58,7 +58,7 @@ Main = {
     Preview.FileName = VideoName + ".jpg";
 
   };
-  VideoLookAtCamera RotatingGif(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera RotatingGif(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "LumbarSpine_rotating_model";
 
@@ -67,7 +67,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {300,500};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsLumbar.L1Seg.T12L1JntNode.r + {0,-0.01,0};

diff --git a/Docs/body/_static/ShoulderArm_media.any b/Docs/body/_static/ShoulderArm_media.any
@@ -39,7 +39,7 @@ Main = {
   };   
 
 
-  VideoLookAtCamera RotatingGif(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera RotatingGif(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "ShoulderArm_rotating_model";
 
@@ -48,7 +48,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {350,350};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsLumbar.PelvisSeg.r+{0,0.22,0};

diff --git a/Docs/body/_static/TLEM1_media.any b/Docs/body/_static/TLEM1_media.any
@@ -28,7 +28,7 @@ Main = {
   };   
 
 
-  VideoLookAtCamera RotatingVideo(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera RotatingVideo(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "TLEM1_rotating_model";
 
@@ -37,7 +37,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {350,350};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsLumbar.PelvisSeg.r+{0, -0.50, 0};

diff --git a/Docs/body/_static/TLEM22_TLEM21_comparison.any b/Docs/body/_static/TLEM22_TLEM21_comparison.any
@@ -381,7 +381,7 @@ Main = {
 
 
 
-  VideoLookAtCamera RotatingVideo(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF) =
+  VideoLookAtCamera RotatingVideo(UP_DIRECTION=y , _AUTO_PLAY_VIDEOS=OFF, VIDEO_ENCODER="xvid") =
   {
     VideoName = "TLEM22_TLEM21_rotating_model";
 
@@ -390,7 +390,6 @@ Main = {
     };
     VideoInputScale = 5;
     VideoResolution = {650,650};
-    VideoCodec = "libx264";
     VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
 //    CameraLookAtPoint = Main.HumanModel.BodyModel.Trunk.SegmentsLumbar.PelvisSeg.r+{0, -0.90, 0};

diff --git a/Tests/Cameras.any b/Tests/Cameras.any
@@ -62,7 +62,7 @@
   {
       AnyOperation& InitPosImage = Main.VideoCam.Create_Video; 
   };
-  VideoLookAtCamera VideoCam(_AUTO_PLAY_VIDEOS=_OPEN_PREVIEW) =
+  VideoLookAtCamera VideoCam(_AUTO_PLAY_VIDEOS=_OPEN_PREVIEW, VIDEO_ENCODER="xvid") =
   {
     VideoName = Main.CameraName;
     Analysis = {
@@ -71,8 +71,7 @@
     VideoInputScale = 5;
     VideoResolution = {350,350};
     CameraUpDirection = Main.LoadTimeCam.CameraUpDirection;
-//    VideoCodec = "libx264";
-    VideoInputFrameRate = 30; 
+//    VideoInputFrameRate = 30; 
     VideoOutputFrameRate = 30;
     CameraLookAtPoint = Main.InitPosCam.CameraLookAtPoint;
     CameraFieldOfView = Main.InitPosCam.CameraFieldOfView;