A method for optimizing a scheduler for an optical pick-up reduces switch times required for seamless video angle switching. The pick-up reads data streams from different files on an optical storage medium, e.g. Blu-Ray disc. Seamless video angle switching requires reading and buffering a new video data stream from another file, delaying the switch to be visible. Labels that mark entry points for seamless angle switching are attached to the video stream, and are stored together with the video data in a buffer. When an angle switch is requested, and thus a switch to a new video data stream, the scheduler determines the time before data from the new data stream can be buffered, detects the next label, and stores the new data beyond the label, thus flushing non-relevant parts of the previous buffer contents.