Update src/streamlit_app.py

src/streamlit_app.py

@@ -1,40 +1,50 @@
 import streamlit as st
+import av
 import cv2
 import numpy as np
-from PIL import Image
-import time
 import mediapipe as mp
+from streamlit_webrtc import webrtc_streamer, WebRtcMode
 
+# Initialize MediaPipe Pose
 mp_pose = mp.solutions.pose
-pose = mp_pose.Pose(
-    min_detection_confidence=0.5,
-    min_tracking_confidence=0.5,
-    model_complexity=1
-)
 mp_drawing = mp.solutions.drawing_utils
 
+# Session state initialization
+if 'camera_access' not in st.session_state:
+    st.session_state.camera_access = False
+if 'posture_status' not in st.session_state:
+    st.session_state.posture_status = "カメラを起動してください (Please enable camera)"
+if 'last_status' not in st.session_state:
+    st.session_state.last_status = ""
+
 def analyze_posture(image):
-    """Analyze posture on the image and return the image with keypoints and analysis text"""
-    image_rgb = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
-    results = pose.process(image_rgb)
-    
-    annotated_image = image.copy()
-    if results.pose_landmarks:
-        mp_drawing.draw_landmarks(
-            annotated_image, 
-            results.pose_landmarks, 
-            mp_pose.POSE_CONNECTIONS,
-            mp_drawing.DrawingSpec(color=(0, 255, 0), thickness=2, circle_radius=2),
-            mp_drawing.DrawingSpec(color=(0, 0, 255), thickness=2)
-        )
-        posture_status = check_posture(results.pose_landmarks, image.shape)
-    else:
-        posture_status = "キーポイントが検出されませんでした (Key points not detected)"
-    
-    return annotated_image, posture_status
+    """Analyze posture on the image and return annotated image and status"""
+    with mp_pose.Pose(
+        min_detection_confidence=0.5,
+        min_tracking_confidence=0.5,
+        model_complexity=1
+    ) as pose:
+        
+        image_rgb = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
+        results = pose.process(image_rgb)
+        
+        annotated_image = image.copy()
+        if results.pose_landmarks:
+            mp_drawing.draw_landmarks(
+                annotated_image, 
+                results.pose_landmarks, 
+                mp_pose.POSE_CONNECTIONS,
+                mp_drawing.DrawingSpec(color=(0, 255, 0), thickness=2, circle_radius=2),
+                mp_drawing.DrawingSpec(color=(0, 0, 255), thickness=2)
+            )
+            posture_status = check_posture(results.pose_landmarks, image.shape)
+        else:
+            posture_status = "キーポイントが検出されませんでした (Key points not detected)"
+        
+        return annotated_image, posture_status
 
 def check_posture(landmarks, image_shape):
-    """Analyze posture and return a text report"""
+    """Analyze posture and return text report"""
     h, w, _ = image_shape
     
     # Get key points
@@ -93,54 +103,55 @@ def check_posture(landmarks, image_shape):
     
     return "\n\n".join(report)
 
+def video_frame_callback(frame):
+    """Process each video frame"""
+    img = frame.to_ndarray(format="bgr24")
+    
+    try:
+        analyzed_img, posture_status = analyze_posture(img)
+        if posture_status != st.session_state.last_status:
+            st.session_state.posture_status = posture_status
+            st.session_state.last_status = posture_status
+        return av.VideoFrame.from_ndarray(analyzed_img, format="bgr24")
+    except Exception as e:
+        st.error(f"処理エラー: {str(e)} (Processing error)")
+        return av.VideoFrame.from_ndarray(img, format="bgr24")
+
 def main():
     st.set_page_config(layout="wide")
-    st.title("📷 姿勢分析アプリ (Posture Analyzer)")
+    st.title("📷 リアルタイム姿勢分析アプリ (Real-time Posture Analyzer)")
     
+    # Create columns
     col1, col2 = st.columns([2, 1])
     
     with col1:
         st.header("カメラビュー (Camera View)")
         
-        if st.button("カメラアクセスを許可 (Allow camera access)"):
-            st.session_state.camera_allowed = True
-            
-        if not st.session_state.get('camera_allowed', False):
+        if not st.session_state.camera_access:
             st.warning("⚠️ カメラを使用するには許可が必要です (Camera access requires permission)")
-            st.image("demo_pose.jpg")  # Заглушка
-            run = False
+            if st.button("カメラアクセスを許可 (Allow camera access)"):
+                st.session_state.camera_access = True
+                st.rerun()
         else:
-            run = st.checkbox("カメラを起動 (Enable camera)", value=True)
-            FRAME_WINDOW = st.image([])
+            webrtc_ctx = webrtc_streamer(
+                key="posture-analysis",
+                mode=WebRtcMode.SENDRECV,
+                video_frame_callback=video_frame_callback,
+                media_stream_constraints={"video": True, "audio": False},
+                async_processing=True,
+                rtc_configuration={
+                    "iceServers": [{"urls": ["stun:stun.l.google.com:19302"]}]
+                }
+            )
+            
+            if not webrtc_ctx.state.playing:
+                st.session_state.posture_status = "カメラが停止しました (Camera stopped)"
+                st.session_state.last_status = ""
     
     with col2:
-        st.header("姿勢分析 (Posture Analysis)")
+        st.header("姿勢分析結果 (Posture Analysis)")
         status_placeholder = st.empty()
-        
-        uploaded_file = st.file_uploader("または画像をアップロード (Or upload image)", 
-                                      type=["jpg", "png", "jpeg"])
-    
-    if run and st.session_state.camera_allowed:
-        camera = cv2.VideoCapture(0)
-        if not camera.isOpened():
-            st.error("カメラエラー: デバイスに接続できません (Camera error: Device not accessible)")
-            run = False
-            
-        while run:
-            ret, frame = camera.read()
-            if ret:
-                analyzed_frame, posture_status = analyze_posture(frame)
-                FRAME_WINDOW.image(analyzed_frame)
-                status_placeholder.markdown(posture_status)
-            time.sleep(0.1)
-        camera.release()
-    
-    elif uploaded_file:
-        file_bytes = np.frombuffer(uploaded_file.read(), np.uint8)
-        frame = cv2.imdecode(file_bytes, cv2.IMREAD_COLOR)
-        analyzed_frame, posture_status = analyze_posture(frame)
-        col1.image(analyzed_frame)
-        status_placeholder.markdown(posture_status)
+        status_placeholder.markdown(st.session_state.posture_status)
 
 if __name__ == "__main__":
     main()